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

Replaced all direct references to ini and translationIni with GetConfig*()

Browse Source
This commit is contained in:
phobos2077
2017-03-05 18:25:33 +07:00
parent 6f0901f980
commit a016e4a236
21 changed files with 144 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine/Structs.h
+6
View File
@@ -302,6 +302,12 @@ struct sPath {
sPath* next; sPath* next;
}; };
struct PremadeChar {
char path[20];
DWORD fid;
char unknown[20];
};
struct sProtoBase { struct sProtoBase {
long pid; long pid;
long message_num; long message_num;
sfall/FalloutEngine/Utils.h
+9 -1
View File
@@ -17,6 +17,10 @@
*/ */
#pragma once #pragma once
#include <string>
#include "Wrappers.h"
// //
// Various utility functions, based on FO engine functions // Various utility functions, based on FO engine functions
// //
@@ -24,6 +28,10 @@
// returns weapon animation code // returns weapon animation code
char AnimCodeByWeapon(TGameObj* weapon); char AnimCodeByWeapon(TGameObj* weapon);
inline void DisplayPrint(const std::string& str) {
Wrapper::display_print(str.c_str());
}
// returns message string from given file // returns message string from given file
const char* _stdcall GetMessageStr(const MessageList* fileAddr, int messageId); const char* _stdcall GetMessageStr(const MessageList* fileAddr, int messageId);
@@ -36,4 +44,4 @@ sProtoItem* GetItemProto(int pid);
void SkillGetTags(int* result, long num); void SkillGetTags(int* result, long num);
// wrapper for skill_set_tags with bounds checking // wrapper for skill_set_tags with bounds checking
void SkillSetTags(int* tags, long num); void SkillSetTags(int* tags, long num);
sfall/Modules/AI.cpp
+8 -9
View File
@@ -29,6 +29,9 @@ typedef std::unordered_map<DWORD, DWORD> :: const_iterator iter;
static std::unordered_map<DWORD,DWORD> targets; static std::unordered_map<DWORD,DWORD> targets;
static std::unordered_map<DWORD,DWORD> sources; static std::unordered_map<DWORD,DWORD> sources;
static DWORD combatDisabled;
static std::string combatBlockedMessage;
DWORD _stdcall AIGetLastAttacker(DWORD target) { DWORD _stdcall AIGetLastAttacker(DWORD target) {
iter itr=sources.find(target); iter itr=sources.find(target);
if(itr==sources.end()) return 0; if(itr==sources.end()) return 0;
@@ -57,18 +60,15 @@ static void __declspec(naked) combat_attack_hook() {
} }
} }
static DWORD CombatDisabled;
static char CombatBlockedMessage[128];
static void _stdcall CombatBlocked() { static void _stdcall CombatBlocked() {
Wrapper::display_print(CombatBlockedMessage); Wrapper::display_print(combatBlockedMessage.c_str());
} }
static const DWORD BlockCombatHook1Ret1=0x45F6B4; static const DWORD BlockCombatHook1Ret1=0x45F6B4;
static const DWORD BlockCombatHook1Ret2=0x45F6D7; static const DWORD BlockCombatHook1Ret2=0x45F6D7;
static void __declspec(naked) BlockCombatHook1() { static void __declspec(naked) BlockCombatHook1() {
__asm { __asm {
mov eax, CombatDisabled; mov eax, combatDisabled;
test eax, eax; test eax, eax;
jz end; jz end;
call CombatBlocked; call CombatBlocked;
@@ -84,7 +84,7 @@ static void __declspec(naked) BlockCombatHook2() {
mov eax, dword ptr ds:[VARPTR_intfaceEnabled]; mov eax, dword ptr ds:[VARPTR_intfaceEnabled];
test eax, eax; test eax, eax;
jz end; jz end;
mov eax, CombatDisabled; mov eax, combatDisabled;
test eax, eax; test eax, eax;
jz succeed; jz succeed;
pushad; pushad;
@@ -100,8 +100,7 @@ end:
} }
void _stdcall AIBlockCombat(DWORD i) { void _stdcall AIBlockCombat(DWORD i) {
if(i) CombatDisabled=1; combatDisabled = i ? 1 : 0;
else CombatDisabled=0;
} }
void AI::init() { void AI::init() {
@@ -111,7 +110,7 @@ void AI::init() {
HookCall(0x42A796, combat_attack_hook); HookCall(0x42A796, combat_attack_hook);
MakeCall(0x45F6AF, BlockCombatHook1, true); MakeCall(0x45F6AF, BlockCombatHook1, true);
HookCall(0x4432A6, BlockCombatHook2); HookCall(0x4432A6, BlockCombatHook2);
GetPrivateProfileString("sfall", "BlockedCombat", "You cannot enter combat at this time.", CombatBlockedMessage, 128, translationIni); combatBlockedMessage = Translate("sfall", "BlockedCombat", "You cannot enter combat at this time.");
} }
void _stdcall AICombatStart() { void _stdcall AICombatStart() {
sfall/Modules/BarBoxes.cpp
+3 -4
View File
@@ -78,11 +78,10 @@ void BarBoxes::init() {
SafeWrite8(0x461495, 0x78); SafeWrite8(0x461495, 0x78);
MakeCall(0x4615A3, &DisplayBoxesHook, true); MakeCall(0x4615A3, &DisplayBoxesHook, true);
char buf[6]; auto boxBarColors = GetConfigString("Misc", "BoxBarColours", "", 6);
GetPrivateProfileString("Misc", "BoxBarColours", "", buf, 6, ini); if (boxBarColors.size() == 5) {
if (strlen(buf) == 5) {
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
if (buf[i] == '1') { if (boxBarColors[i] == '1') {
boxes[i + 5].colour = 1; boxes[i + 5].colour = 1;
} }
} }
sfall/Modules/Books.cpp
+3 -4
View File
@@ -85,10 +85,9 @@ void LoadVanillaBooks() {
} }
void Books::init() { void Books::init() {
char buf[MAX_PATH - 3]; auto booksFile = GetConfigString("Misc", "BooksFile", "", MAX_PATH);
GetPrivateProfileString("Misc", "BooksFile", "", buf, MAX_PATH, ini); if (booksFile.size() > 0) {
if (strlen(buf) > 0) { sprintf(iniBooks, ".\\%s", booksFile.c_str());
sprintf(iniBooks, ".\\%s", buf);
dlog("Applying books patch... ", DL_INIT); dlog("Applying books patch... ", DL_INIT);
memset(books, 0, sizeof(sBook)*BooksCount); memset(books, 0, sizeof(sBook)*BooksCount);
sfall/Modules/CRC.cpp
+12 -9
View File
@@ -16,12 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "..\main.h" #include <algorithm>
#include <stdio.h> #include <stdio.h>
#include "..\main.h"
#include "..\Version.h" #include "..\Version.h"
#include "..\Logging.h" #include "..\Logging.h"
#include "CRC.h"
static const DWORD ExpectedSize=0x00122800; static const DWORD ExpectedSize=0x00122800;
static const DWORD ExpectedCRC[]= {0xe1680293, 0xef34f989}; static const DWORD ExpectedCRC[]= {0xe1680293, 0xef34f989};
@@ -91,13 +94,13 @@ void CRC(const char* filepath) {
bool matchedCRC = false; bool matchedCRC = false;
if (isDebug && GetPrivateProfileStringA("Debugging", "ExtraCRC", "", buf, 512, ddrawIni) > 0) { if (isDebug) {
char *TestCRC; auto extraCrcList = GetIniList("Debugging", "ExtraCRC", "", 512, ',', ddrawIni);
TestCRC = strtok(buf, ","); if (extraCrcList.size() > 0) {
while (TestCRC) { matchedCRC = std::any_of(extraCrcList.begin(), extraCrcList.end(), [crc](const std::string& testCrcStr) {
DWORD extraCRC = strtoul(TestCRC, 0, 16); auto testedCrc = strtoul(testCrcStr.c_str(), 0, 16);
if (crc == extraCRC) matchedCRC = true; return testedCrc && crc == testedCrc;
TestCRC = strtok(0, ","); });
} }
} }
sfall/Modules/Console.cpp
+2 -3
View File
@@ -46,9 +46,8 @@ static void __declspec(naked) ConsoleHook() {
} }
void Console::init() { void Console::init() {
char path[MAX_PATH]; auto path = GetConfigString("Misc", "ConsoleOutputPath", "", MAX_PATH);
GetPrivateProfileString("Misc", "ConsoleOutputPath", "", path, MAX_PATH, ini); if (path.size() > 0) {
if (strlen(path) > 0) {
consolefile.open(path); consolefile.open(path);
if (consolefile.is_open()) { if (consolefile.is_open()) {
MakeCall(0x43186C, &ConsoleHook, true); MakeCall(0x43186C, &ConsoleHook, true);
sfall/Modules/Elevators.cpp
+21 -22
View File
@@ -22,7 +22,7 @@
#include "..\FalloutEngine\Fallout2.h" #include "..\FalloutEngine\Fallout2.h"
static const int ElevatorCount = 50; static const int ElevatorCount = 50;
static char File[MAX_PATH]; static char elevFile[MAX_PATH];
static sElevator Elevators[ElevatorCount]; static sElevator Elevators[ElevatorCount];
@@ -105,29 +105,29 @@ void ResetElevators() {
for (int i = 0; i < 24; i++) Menus[i] = i; for (int i = 0; i < 24; i++) Menus[i] = i;
for (int i = 24; i < ElevatorCount; i++) Menus[i] = 0; for (int i = 24; i < ElevatorCount; i++) Menus[i] = 0;
char section[4]; char section[4];
if (File) { if (elevFile) {
for (int i = 0; i < ElevatorCount; i++) { for (int i = 0; i < ElevatorCount; i++) {
_itoa_s(i, section, 10); _itoa_s(i, section, 10);
Menus[i] = GetPrivateProfileIntA(section, "Image", Menus[i], File); Menus[i] = GetPrivateProfileIntA(section, "Image", Menus[i], elevFile);
Elevators[i].ID1 = GetPrivateProfileIntA(section, "ID1", Elevators[i].ID1, File); Elevators[i].ID1 = GetPrivateProfileIntA(section, "ID1", Elevators[i].ID1, elevFile);
Elevators[i].ID2 = GetPrivateProfileIntA(section, "ID2", Elevators[i].ID2, File); Elevators[i].ID2 = GetPrivateProfileIntA(section, "ID2", Elevators[i].ID2, elevFile);
Elevators[i].ID3 = GetPrivateProfileIntA(section, "ID3", Elevators[i].ID3, File); Elevators[i].ID3 = GetPrivateProfileIntA(section, "ID3", Elevators[i].ID3, elevFile);
Elevators[i].ID4 = GetPrivateProfileIntA(section, "ID4", Elevators[i].ID4, File); Elevators[i].ID4 = GetPrivateProfileIntA(section, "ID4", Elevators[i].ID4, elevFile);
Elevators[i].Elevation1 = GetPrivateProfileIntA(section, "Elevation1", Elevators[i].Elevation1, File); Elevators[i].Elevation1 = GetPrivateProfileIntA(section, "Elevation1", Elevators[i].Elevation1, elevFile);
Elevators[i].Elevation2 = GetPrivateProfileIntA(section, "Elevation2", Elevators[i].Elevation2, File); Elevators[i].Elevation2 = GetPrivateProfileIntA(section, "Elevation2", Elevators[i].Elevation2, elevFile);
Elevators[i].Elevation3 = GetPrivateProfileIntA(section, "Elevation3", Elevators[i].Elevation3, File); Elevators[i].Elevation3 = GetPrivateProfileIntA(section, "Elevation3", Elevators[i].Elevation3, elevFile);
Elevators[i].Elevation4 = GetPrivateProfileIntA(section, "Elevation4", Elevators[i].Elevation4, File); Elevators[i].Elevation4 = GetPrivateProfileIntA(section, "Elevation4", Elevators[i].Elevation4, elevFile);
Elevators[i].Tile1 = GetPrivateProfileIntA(section, "Tile1", Elevators[i].Tile1, File); Elevators[i].Tile1 = GetPrivateProfileIntA(section, "Tile1", Elevators[i].Tile1, elevFile);
Elevators[i].Tile2 = GetPrivateProfileIntA(section, "Tile2", Elevators[i].Tile2, File); Elevators[i].Tile2 = GetPrivateProfileIntA(section, "Tile2", Elevators[i].Tile2, elevFile);
Elevators[i].Tile3 = GetPrivateProfileIntA(section, "Tile3", Elevators[i].Tile3, File); Elevators[i].Tile3 = GetPrivateProfileIntA(section, "Tile3", Elevators[i].Tile3, elevFile);
Elevators[i].Tile4 = GetPrivateProfileIntA(section, "Tile4", Elevators[i].Tile4, File); Elevators[i].Tile4 = GetPrivateProfileIntA(section, "Tile4", Elevators[i].Tile4, elevFile);
} }
} }
} }
void ElevatorsInit(char* file) { void ElevatorsInit(const char* file) {
strcpy_s(File, ".\\"); strcpy_s(elevFile, ".\\");
strcat_s(File, file); strcat_s(elevFile, file);
HookCall(0x43EF83, GetMenuHook); HookCall(0x43EF83, GetMenuHook);
HookCall(0x43F141, UnknownHook); HookCall(0x43F141, UnknownHook);
HookCall(0x43F2D2, UnknownHook2); HookCall(0x43F2D2, UnknownHook2);
@@ -149,10 +149,9 @@ void ElevatorsInit(char* file) {
} }
void Elevators::init() { void Elevators::init() {
char elevPath[MAX_PATH]; auto elevPath = GetConfigString("Misc", "ElevatorsFile", "", MAX_PATH);
GetPrivateProfileString("Misc", "ElevatorsFile", "", elevPath, MAX_PATH, ini); if (elevPath.size() > 0) {
if (strlen(elevPath) > 0) {
dlogr("Applying elevator patch.", DL_INIT); dlogr("Applying elevator patch.", DL_INIT);
ElevatorsInit(elevPath); ElevatorsInit(elevPath.c_str());
} }
} }
sfall/Modules/HeroAppearance.cpp
+8 -5
View File
@@ -1603,11 +1603,14 @@ void _stdcall HeroSelectWindow(int RaceStyleFlag) {
SetFont(0x67); SetFont(0x67);
BYTE textColour = *(BYTE*)0x6A82F3; //PeanutButter colour -palette offset stored in mem BYTE textColour = *(BYTE*)0x6A82F3; //PeanutButter colour -palette offset stored in mem
char titleText[8]; char titleText[16];
DWORD titleTextWidth; DWORD titleTextWidth;
//Get alternate text from ini if available //Get alternate text from ini if available
if (isStyle) GetPrivateProfileString("AppearanceMod", "StyleText", "Style", titleText, 8, translationIni); if (isStyle) {
else GetPrivateProfileString("AppearanceMod", "RaceText", "Race", titleText, 8, translationIni); Translate("AppearanceMod", "StyleText", "Style", titleText, 16);
} else {
Translate("AppearanceMod", "RaceText", "Race", titleText, 16);
}
titleTextWidth = GetTextWidth(titleText); titleTextWidth = GetTextWidth(titleText);
@@ -2174,8 +2177,8 @@ static void __declspec(naked) FixCharScrnBack(void) {
DWORD raceTextWidth, styleTextWidth; DWORD raceTextWidth, styleTextWidth;
//Get alternate text from ini if available //Get alternate text from ini if available
GetPrivateProfileString("AppearanceMod", "RaceText", "Race", RaceText, 8, translationIni); Translate("AppearanceMod", "RaceText", "Race", RaceText, 8);
GetPrivateProfileString("AppearanceMod", "StyleText", "Style", StyleText, 8, translationIni); Translate("AppearanceMod", "StyleText", "Style", StyleText, 8);
raceTextWidth=GetTextWidth(RaceText); raceTextWidth=GetTextWidth(RaceText);
styleTextWidth=GetTextWidth(StyleText); styleTextWidth=GetTextWidth(StyleText);
sfall/Modules/Inventory.cpp
+3 -3
View File
@@ -391,7 +391,7 @@ static __declspec(naked) void InvenObjExamineFuncHook() {
} }
} }
static char SuperStimMsg[128]; static std::string superStimMsg;
static int _stdcall SuperStimFix2(DWORD* item, DWORD* target) { static int _stdcall SuperStimFix2(DWORD* item, DWORD* target) {
if (!item || !target) return 0; if (!item || !target) return 0;
DWORD itm_pid = item[0x64 / 4], target_pid = target[0x64 / 4]; DWORD itm_pid = item[0x64 / 4], target_pid = target[0x64 / 4];
@@ -410,7 +410,7 @@ static int _stdcall SuperStimFix2(DWORD* item, DWORD* target) {
mov max_hp, eax; mov max_hp, eax;
} }
if (curr_hp < max_hp) return 0; if (curr_hp < max_hp) return 0;
Wrapper::display_print(SuperStimMsg); Wrapper::display_print(superStimMsg.c_str());
return 1; return 1;
} }
@@ -663,7 +663,7 @@ void Inventory::init() {
} }
if (GetConfigInt("Misc", "SuperStimExploitFix", 0)) { if (GetConfigInt("Misc", "SuperStimExploitFix", 0)) {
GetPrivateProfileString("sfall", "SuperStimExploitMsg", "You cannot use a super stim on someone who is not injured!", SuperStimMsg, 128, translationIni); superStimMsg = Translate("sfall", "SuperStimExploitMsg", "You cannot use a super stim on someone who is not injured!");
MakeCall(0x49C3CC, SuperStimFix, true); MakeCall(0x49C3CC, SuperStimFix, true);
} }
sfall/Modules/LoadGameHook.cpp
+8 -8
View File
@@ -71,8 +71,7 @@ void GetSavePath(char* buf, char* ftype) {
sprintf(buf, "%s\\savegame\\slot%.2d\\sfall%s.sav", VarPtr::patches, VarPtr::slot_cursor + 1 + LSPageOffset, ftype); //add SuperSave Page offset sprintf(buf, "%s\\savegame\\slot%.2d\\sfall%s.sav", VarPtr::patches, VarPtr::slot_cursor + 1 + LSPageOffset, ftype); //add SuperSave Page offset
} }
static char saveSfallDataFailMsg[128]; static std::string saveSfallDataFailMsg;
static void _stdcall SaveGame2() { static void _stdcall SaveGame2() {
char buf[MAX_PATH]; char buf[MAX_PATH];
GetSavePath(buf, "gv"); GetSavePath(buf, "gv");
@@ -91,7 +90,7 @@ static void _stdcall SaveGame2() {
CloseHandle(h); CloseHandle(h);
} else { } else {
dlogr("ERROR creating sfallgv!", DL_MAIN); dlogr("ERROR creating sfallgv!", DL_MAIN);
Wrapper::display_print(saveSfallDataFailMsg); DisplayPrint(saveSfallDataFailMsg);
Wrapper::gsound_play_sfx_file("IISXXXX1"); Wrapper::gsound_play_sfx_file("IISXXXX1");
} }
GetSavePath(buf, "fs"); GetSavePath(buf, "fs");
@@ -102,18 +101,18 @@ static void _stdcall SaveGame2() {
CloseHandle(h); CloseHandle(h);
} }
static char saveFailMsg[128]; static std::string saveFailMsg;
static DWORD _stdcall CombatSaveTest() { static DWORD _stdcall CombatSaveTest() {
if (!saveInCombatFix && !IsNpcControlled()) return 1; if (!saveInCombatFix && !IsNpcControlled()) return 1;
if (inLoop & COMBAT) { if (inLoop & COMBAT) {
if (saveInCombatFix == 2 || IsNpcControlled() || !(inLoop & PCOMBAT)) { if (saveInCombatFix == 2 || IsNpcControlled() || !(inLoop & PCOMBAT)) {
Wrapper::display_print(saveFailMsg); DisplayPrint(saveFailMsg);
return 0; return 0;
} }
int ap = Wrapper::stat_level(VarPtr::obj_dude, STAT_max_move_points); int ap = Wrapper::stat_level(VarPtr::obj_dude, STAT_max_move_points);
int bonusmove = Wrapper::perk_level(VarPtr::obj_dude, PERK_bonus_move); int bonusmove = Wrapper::perk_level(VarPtr::obj_dude, PERK_bonus_move);
if (VarPtr::obj_dude->critterAP_weaponAmmoPid != ap || bonusmove * 2 != VarPtr::combat_free_move) { if (VarPtr::obj_dude->critterAP_weaponAmmoPid != ap || bonusmove * 2 != VarPtr::combat_free_move) {
Wrapper::display_print(saveFailMsg); DisplayPrint(saveFailMsg);
return 0; return 0;
} }
} }
@@ -404,8 +403,9 @@ static void __declspec(naked) AutomapHook() {
void LoadGameHook::init() { void LoadGameHook::init() {
saveInCombatFix = GetConfigInt("Misc", "SaveInCombatFix", 1); saveInCombatFix = GetConfigInt("Misc", "SaveInCombatFix", 1);
if (saveInCombatFix > 2) saveInCombatFix = 0; if (saveInCombatFix > 2) saveInCombatFix = 0;
GetPrivateProfileString("sfall", "SaveInCombat", "Cannot save at this time", saveFailMsg, 128, translationIni); saveFailMsg = Translate("sfall", "SaveInCombat", "Cannot save at this time");
GetPrivateProfileString("sfall", "SaveSfallDataFail", "ERROR saving extended savegame information! Check if other programs interfere with savegame files/folders and try again!", saveSfallDataFailMsg, 128, translationIni); saveSfallDataFailMsg = Translate("sfall", "SaveSfallDataFail",
"ERROR saving extended savegame information! Check if other programs interfere with savegame files/folders and try again!");
HookCall(0x480AAE, main_load_new_hook); HookCall(0x480AAE, main_load_new_hook);
sfall/Modules/MiscPatches.cpp
+4 -4
View File
@@ -743,21 +743,21 @@ void DisableHorriganPatch() {
void MiscPatches::init() { void MiscPatches::init() {
mapName[64] = 0; mapName[64] = 0;
if (GetPrivateProfileString("Misc", "StartingMap", "", mapName, 64, ini)) { if (GetConfigString("Misc", "StartingMap", "", mapName, 64)) {
dlog("Applying starting map patch.", DL_INIT); dlog("Applying starting map patch.", DL_INIT);
SafeWrite32(0x00480AAA, (DWORD)&mapName); SafeWrite32(0x00480AAA, (DWORD)&mapName);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
versionString[64] = 0; versionString[64] = 0;
if (GetPrivateProfileString("Misc", "VersionString", "", versionString, 64, ini)) { if (GetConfigString("Misc", "VersionString", "", versionString, 64)) {
dlog("Applying version string patch.", DL_INIT); dlog("Applying version string patch.", DL_INIT);
SafeWrite32(0x004B4588, (DWORD)&versionString); SafeWrite32(0x004B4588, (DWORD)&versionString);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
configName[64] = 0; configName[64] = 0;
if (GetPrivateProfileString("Misc", "ConfigFile", "", configName, 64, ini)) { if (GetConfigString("Misc", "ConfigFile", "", configName, 64)) {
dlog("Applying config file patch.", DL_INIT); dlog("Applying config file patch.", DL_INIT);
SafeWrite32(0x00444BA5, (DWORD)&configName); SafeWrite32(0x00444BA5, (DWORD)&configName);
SafeWrite32(0x00444BCA, (DWORD)&configName); SafeWrite32(0x00444BCA, (DWORD)&configName);
@@ -765,7 +765,7 @@ void MiscPatches::init() {
} }
patchName[64] = 0; patchName[64] = 0;
if (GetPrivateProfileString("Misc", "PatchFile", "", patchName, 64, ini)) { if (GetConfigString("Misc", "PatchFile", "", patchName, 64)) {
dlog("Applying patch file patch.", DL_INIT); dlog("Applying patch file patch.", DL_INIT);
SafeWrite32(0x00444323, (DWORD)&patchName); SafeWrite32(0x00444323, (DWORD)&patchName);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
sfall/Modules/Movies.cpp
+2 -2
View File
@@ -548,9 +548,9 @@ void Movies::init() {
strcpy_s(ininame, "Movie"); strcpy_s(ininame, "Movie");
_itoa_s(i + 1, &ininame[5], 3, 10); _itoa_s(i + 1, &ininame[5], 3, 10);
if (i < 17) { if (i < 17) {
GetPrivateProfileString("Misc", ininame, (char*)(0x518DA0 + i * 4), &MoviePaths[i * 65], 65, ini); GetConfigString("Misc", ininame, (char*)(0x518DA0 + i * 4), &MoviePaths[i * 65], 65);
} else { } else {
GetPrivateProfileString("Misc", ininame, "", &MoviePaths[i * 65], 65, ini); GetConfigString("Misc", ininame, "", &MoviePaths[i * 65], 65);
} }
} }
dlog(".", DL_INIT); dlog(".", DL_INIT);
sfall/Modules/Perks.cpp
+5 -3
View File
@@ -30,7 +30,7 @@ static char Name[64 * PERK_count];
static char Desc[1024 * PERK_count]; static char Desc[1024 * PERK_count];
static char tName[64 * TRAIT_count]; static char tName[64 * TRAIT_count];
static char tDesc[1024 * TRAIT_count]; static char tDesc[1024 * TRAIT_count];
static char perksFile[260]; static char perksFile[MAX_PATH];
static BYTE disableTraits[TRAIT_count]; static BYTE disableTraits[TRAIT_count];
#define check_trait(a) !disableTraits[a] && (VarPtr::pc_trait[0] == a || VarPtr::pc_trait[1] == a) #define check_trait(a) !disableTraits[a] && (VarPtr::pc_trait[0] == a || VarPtr::pc_trait[1] == a)
@@ -671,7 +671,9 @@ static void PerkSetup() {
char num[4]; char num[4];
for (int i = 0; i < PERK_count; i++) { for (int i = 0; i < PERK_count; i++) {
_itoa_s(i, num, 10); _itoa_s(i, num, 10);
if (GetPrivateProfileString(num, "Name", "", &Name[i * 64], 63, perksFile)) Perks[i].Name = &Name[i * 64]; if (GetPrivateProfileString(num, "Name", "", &Name[i * 64], 63, perksFile)) {
Perks[i].Name = &Name[i * 64];
}
if (GetPrivateProfileString(num, "Desc", "", &Desc[i * 1024], 1023, perksFile)) { if (GetPrivateProfileString(num, "Desc", "", &Desc[i * 1024], 1023, perksFile)) {
Perks[i].Desc = &Desc[i * 1024]; Perks[i].Desc = &Desc[i * 1024];
} }
@@ -1109,7 +1111,7 @@ void Perks::init() {
for (int i = STAT_st; i <= STAT_lu; i++) SafeWrite8(GainStatPerks[i][0], (BYTE)GainStatPerks[i][1]); for (int i = STAT_st; i <= STAT_lu; i++) SafeWrite8(GainStatPerks[i][0], (BYTE)GainStatPerks[i][1]);
HookCall(0x442729, &PerkInitWrapper); HookCall(0x442729, &PerkInitWrapper);
if (GetPrivateProfileString("Misc", "PerksFile", "", &perksFile[2], 257, ini)) { if (GetConfigString("Misc", "PerksFile", "", &perksFile[2], MAX_PATH)) {
perksFile[0] = '.'; perksFile[0] = '.';
perksFile[1] = '\\'; perksFile[1] = '\\';
HookCall(0x44272E, &TraitInitWrapper); HookCall(0x44272E, &TraitInitWrapper);
sfall/Modules/PlayerModel.cpp
+16 -16
View File
@@ -23,35 +23,35 @@
#include "PlayerModel.h" #include "PlayerModel.h"
static char StartMaleModelName[65]; static char startMaleModelName[65];
char DefaultMaleModelName[65]; char defaultMaleModelName[65];
static char StartFemaleModelName[65]; static char startFemaleModelName[65];
char DefaultFemaleModelName[65]; char defaultFemaleModelName[65];
void PlayerModel::init() { void PlayerModel::init() {
StartMaleModelName[64] = 0; startMaleModelName[64] = 0;
if (GetPrivateProfileString("Misc", "MaleStartModel", "", StartMaleModelName, 64, ini)) { if (GetConfigString("Misc", "MaleStartModel", "", startMaleModelName, 64)) {
dlog("Applying male start model patch.", DL_INIT); dlog("Applying male start model patch.", DL_INIT);
SafeWrite32(0x00418B88, (DWORD)&StartMaleModelName); SafeWrite32(0x00418B88, (DWORD)&startMaleModelName);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
StartFemaleModelName[64] = 0; startFemaleModelName[64] = 0;
if (GetPrivateProfileString("Misc", "FemaleStartModel", "", StartFemaleModelName, 64, ini)) { if (GetConfigString("Misc", "FemaleStartModel", "", startFemaleModelName, 64)) {
dlog("Applying female start model patch.", DL_INIT); dlog("Applying female start model patch.", DL_INIT);
SafeWrite32(0x00418BAB, (DWORD)&StartFemaleModelName); SafeWrite32(0x00418BAB, (DWORD)&startFemaleModelName);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
DefaultMaleModelName[64] = 0; defaultMaleModelName[64] = 0;
GetPrivateProfileString("Misc", "MaleDefaultModel", "hmjmps", DefaultMaleModelName, 64, ini); GetConfigString("Misc", "MaleDefaultModel", "hmjmps", defaultMaleModelName, 64);
dlog("Applying male model patch.", DL_INIT); dlog("Applying male model patch.", DL_INIT);
SafeWrite32(0x00418B50, (DWORD)&DefaultMaleModelName); SafeWrite32(0x00418B50, (DWORD)&defaultMaleModelName);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
DefaultFemaleModelName[64] = 0; defaultFemaleModelName[64] = 0;
GetPrivateProfileString("Misc", "FemaleDefaultModel", "hfjmps", DefaultFemaleModelName, 64, ini); GetConfigString("Misc", "FemaleDefaultModel", "hfjmps", defaultFemaleModelName, 64);
dlog("Applying female model patch.", DL_INIT); dlog("Applying female model patch.", DL_INIT);
SafeWrite32(0x00418B6D, (DWORD)&DefaultFemaleModelName); SafeWrite32(0x00418B6D, (DWORD)&defaultFemaleModelName);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
sfall/Modules/PlayerModel.h
+2 -2
View File
@@ -24,5 +24,5 @@ class PlayerModel : public Module {
void init(); void init();
}; };
extern char DefaultMaleModelName[65]; extern char defaultMaleModelName[65];
extern char DefaultFemaleModelName[65]; extern char defaultFemaleModelName[65];
sfall/Modules/Premade.cpp
+9 -31
View File
@@ -17,44 +17,22 @@
*/ */
#include "..\main.h" #include "..\main.h"
#include "..\FalloutEngine\Structs.h"
#include "Premade.h" #include "Premade.h"
struct PremadeChar {
char path[20];
DWORD fid;
char unknown[20];
};
PremadeChar* premade; PremadeChar* premade;
void Premade::init() { void Premade::init() {
char buf[512]; auto premadePaths = GetConfigList("misc", "PremadePaths", "", 512);
GetPrivateProfileString("misc", "PremadePaths", "", buf, 512, ini); auto premadeFids = GetConfigList("misc", "PremadeFIDs", "", 512);
if (buf[0]) { if (premadePaths.size() > 0 && premadeFids.size() > 0) {
char buf2[512]; int count = min(premadePaths.size(), premadeFids.size());
GetPrivateProfileString("misc", "PremadeFIDs", "", buf2, 512, ini);
int count = 1;
char* tmp = buf;
while (tmp = strchr(tmp, ',')) {
tmp++; count++;
}
premade = new PremadeChar[count]; premade = new PremadeChar[count];
tmp = buf;
char* tmp2 = buf2;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
char* tmp3 = strchr(tmp, ','); auto path = "premade\\" + premadePaths[i];
if (tmp3) *tmp3 = 0; strcpy_s(premade[i].path, 20, path.c_str());
strcpy_s(premade[i].path, 20, "premade\\"); premade[i].fid = atoi(premadeFids[i].c_str());
strcat_s(premade[i].path, 20, tmp);
tmp = tmp3 + 1;
tmp3 = strchr(tmp2, ',');
if (tmp3) *tmp3 = 0;
premade[i].fid = atoi(tmp2);
tmp2 = tmp3 + 1;
} }
SafeWrite32(0x51C8D4, count); SafeWrite32(0x51C8D4, count);
@@ -63,4 +41,4 @@ void Premade::init() {
SafeWrite32(0x4A7E2C, (DWORD)premade + 20); SafeWrite32(0x4A7E2C, (DWORD)premade + 20);
strcpy_s((char*)0x50AF68, 20, premade[0].path); strcpy_s((char*)0x50AF68, 20, premade[0].path);
} }
} }
sfall/Modules/Scripting/Handlers/Misc.cpp
+2 -2
View File
@@ -32,8 +32,8 @@
#include "Misc.h" #include "Misc.h"
static DWORD defaultMaleModelNamePtr = (DWORD)DefaultMaleModelName; static DWORD defaultMaleModelNamePtr = (DWORD)defaultMaleModelName;
static DWORD defaultFemaleModelNamePtr = (DWORD)DefaultFemaleModelName; static DWORD defaultFemaleModelNamePtr = (DWORD)defaultFemaleModelName;
static DWORD movieNamesPtr = (DWORD)MoviePaths; static DWORD movieNamesPtr = (DWORD)MoviePaths;
sfall/SimplePatch.h
+1 -1
View File
@@ -11,7 +11,7 @@ T SimplePatch(DWORD *addrs, int numAddrs, const char* iniSection, const char* in
{ {
T value; T value;
char msg[255]; char msg[255];
value = (T)GetPrivateProfileIntA(iniSection, iniKey, defaultValue, ini); value = (T)GetConfigInt(iniSection, iniKey, defaultValue);
if (value != defaultValue) { if (value != defaultValue) {
if (value < minValue) if (value < minValue)
value = minValue; value = minValue;
sfall/main.cpp
+12 -4
View File
@@ -75,8 +75,8 @@
bool isDebug = false; bool isDebug = false;
const char ddrawIni[] = ".\\ddraw.ini"; const char ddrawIni[] = ".\\ddraw.ini";
char ini[65]; static char ini[65];
char translationIni[65]; static char translationIni[65];
unsigned int GetConfigInt(const char* section, const char* setting, int defaultValue) { unsigned int GetConfigInt(const char* section, const char* setting, int defaultValue) {
return GetPrivateProfileIntA(section, setting, defaultValue, ::ini); return GetPrivateProfileIntA(section, setting, defaultValue, ::ini);
@@ -91,7 +91,7 @@ std::string GetIniString(const char* section, const char* setting, const char* d
} }
std::vector<std::string> GetIniList(const char* section, const char* setting, const char* defaultValue, size_t bufSize, char delimiter, const char* iniFile) { std::vector<std::string> GetIniList(const char* section, const char* setting, const char* defaultValue, size_t bufSize, char delimiter, const char* iniFile) {
auto list = split(GetConfigString(section, setting, defaultValue, bufSize), delimiter); auto list = split(GetIniString(section, setting, defaultValue, bufSize, iniFile), delimiter);
std::transform(list.cbegin(), list.cend(), list.begin(), trim); std::transform(list.cbegin(), list.cend(), list.begin(), trim);
return list; return list;
} }
@@ -100,6 +100,10 @@ std::string GetConfigString(const char* section, const char* setting, const char
return GetIniString(section, setting, defaultValue, bufSize, ::ini); return GetIniString(section, setting, defaultValue, bufSize, ::ini);
} }
size_t GetConfigString(const char* section, const char* setting, const char* defaultValue, char* buf, size_t bufSize) {
return GetPrivateProfileStringA(section, setting, defaultValue, buf, bufSize, ::ini);
}
std::vector<std::string> GetConfigList(const char* section, const char* setting, const char* defaultValue, size_t bufSize) { std::vector<std::string> GetConfigList(const char* section, const char* setting, const char* defaultValue, size_t bufSize) {
return GetIniList(section, setting, defaultValue, bufSize, ',', ::ini); return GetIniList(section, setting, defaultValue, bufSize, ',', ::ini);
} }
@@ -108,6 +112,10 @@ std::string Translate(const char* section, const char* setting, const char* defa
return GetIniString(section, setting, defaultValue, bufSize, ::translationIni); return GetIniString(section, setting, defaultValue, bufSize, ::translationIni);
} }
size_t Translate(const char* section, const char* setting, const char* defaultValue, char* buffer, size_t bufSize) {
return GetPrivateProfileStringA(section, setting, defaultValue, buffer, bufSize, ::translationIni);
}
static void DllMain2() { static void DllMain2() {
dlogr("In DllMain2", DL_MAIN); dlogr("In DllMain2", DL_MAIN);
@@ -250,7 +258,7 @@ bool _stdcall DllMain(HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) {
strcpy_s(ini, ddrawIni); strcpy_s(ini, ddrawIni);
} }
GetPrivateProfileStringA("Main", "TranslationsINI", "./Translations.ini", translationIni, 65, ini); GetConfigString("Main", "TranslationsINI", "./Translations.ini", translationIni, 65);
DllMain2(); DllMain2();
} }

Some files were not shown because too many files have changed in this diff Show More