Release 4.3.2

Minor changes.

Author: FakelsHub

artifacts/ddraw.ini

@@ -9,6 +9,9 @@ UseCommandLine=0
 ;This file can be placed in text\<language>\ for sfall to get the translations depending on the game language
 ;TranslationsINI=sfall\Translations.ini
 
+;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
+CreditsAtBottom=0
+
 ;Set this to a valid path to save a copy of the console contents
 ;ConsoleOutputPath=console.txt
 
@@ -29,8 +32,8 @@ UseCommandLine=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Speed]
-;Set to 0 to disable everything in this section
-Enable=1
+;Set to 1 to enable related options (SpeedMulti, SpeedModKey, SpeedToggleKey) to control the game speed adjustment
+Enable=0
 
 ;The speeds corresponding to each slot in percent. (i.e. 100 is normal speed)
 SpeedMulti0=50
@@ -704,12 +707,10 @@ KnockoutTime=35
 ;Set to 1 to allow the player's character to automatically move towards the attack target if the distance exceeds the attack range when using a unarmed attack or melee weapons
 AutoMoveToAttack=0
 
-;Set to 1 to display sfall built-in credits at the bottom of credits.txt contents instead of at the top
-CreditsAtBottom=0
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-; Critical engine fixes
+; Critical Modding options
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;Change the following options with some caution if you are sure exactly what you are doing
 
 ;Set to 1 to fix the issue with being able to charge the car by using cells on other scenery/critters
 ;Set to 0 if another mod you're using has custom vehicles
@@ -742,7 +743,8 @@ AttackComplexFix=0
 ;It is recommended to enable this option only when developing a new project
 CreateObjectSidFix=0
 
-;Fixes the execution of the use_p_proc script procedure for containers of the grave type when they are in the open state
+;Set to 1 to fix the execution of the 'use_p_proc' script procedure for containers of the grave type when they are in the open state
+;By default, using open graves does not run the 'use_p_proc' procedure of attached script like other containers
 ;It is recommended to enable this option only when developing a new project
 GraveContainersFix=0
 

artifacts/ddraw_ru.ini

@@ -9,6 +9,9 @@ UseCommandLine=0
 ;Этот файл может быть помещен в папку "data\text\<language>\" чтобы sfall брал локализованный текст в зависимости от выбранного языка игры.   
 ;TranslationsINI=sfall\Translations.ini
 
+;Установите значение 1, чтобы поменять порядок титров. В начале титры игры, а затем титры sfall.
+CreditsAtBottom=0
+
 ;Укажите корректный путь для сохранения копии содержимого консоли
 ;ConsoleOutputPath="bingle.txt"
 
@@ -29,8 +32,8 @@ UseCommandLine=0
 
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Speed]
-;Установите значение 0, чтобы отключить данную секцию.
-Enable=1
+;Установите значение 1, чтобы включить опции SpeedMulti, SpeedModKey, и SpeedToggleKey для управления регулировкой скорости игры.
+Enable=0
 
 ;Скорость соответствующая каждому слоту в процентах. (т.е. 100 - стандартная скорость)
 SpeedMulti0=50
@@ -712,12 +715,10 @@ KnockoutTime=35
 ;Установите значение 1, чтобы позволить персонажу игрока автоматически двигаться к цели атаки, если расстояние превышает дальность рукопашной атаки или оружия ближнего боя.
 AutoMoveToAttack=0
 
-;Установите значение 1, чтобы поменять порядок титров. В начале титры игры, а затем титры sfall.
-CreditsAtBottom=0
-
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-; Критические исправления движка
+; Критические опций моддинга
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+;Изменяйте следующие параметры с некоторой осторожностью, если вы точно уверены в том, что делаете.
 
 ;Установите значение 1, чтобы исправить ошибку в возможности заряжать автомобиль, используя ячейки(cells) на других объектах декорации или криттерах
 ;Установите значение 0, если в моде имеется другой автотранспорт или используются собственные исправления (например Megamod).

artifacts/translations/chs.ini

@@ -22,7 +22,7 @@ StyleText=
 DoneBtn=完成
 
 ;玩家空手攻击招式的自定名称（最长为16个字元，8个中文字）
-[Unarmed]
+[Hits]
 ;Punch=拳击:
 ;Kick=踢击:
 ;StrongPunch=重拳:

artifacts/translations/cht.ini

@@ -22,7 +22,7 @@ StyleText=
 DoneBtn=完成
 
 ;玩家空手攻擊招式的自定名稱（最長為16個字元，8個中文字）
-[Unarmed]
+[Hits]
 ;Punch=拳擊:
 ;Kick=踢擊:
 ;StrongPunch=重拳:

sfall/IniReader.cpp

@@ -34,7 +34,7 @@ static std::string getString(const char* section, const char* setting, const cha
 
 static std::vector<std::string> getList(const char* section, const char* setting, const char* defaultValue, size_t bufSize, char delimiter, const char* iniFile) {
 	auto list = split(getString(section, setting, defaultValue, bufSize, iniFile), delimiter);
-	std::transform(list.cbegin(), list.cend(), list.begin(), trim);
+	std::transform(list.cbegin(), list.cend(), list.begin(), (std::string (*)(const std::string&))trim);
 	return list;
 }
 

sfall/Modules/Animations.cpp

@@ -595,7 +595,7 @@ void ApplyAnimationsAtOncePatches(signed char aniMax) {
 }
 
 void Animations::init() {
-	animationLimit = GetConfigInt("Misc", "AnimationsAtOnceLimit", sfall::animationLimit);
+	animationLimit = IniReader::GetConfigInt("Misc", "AnimationsAtOnceLimit", sfall::animationLimit);
 	if (animationLimit < 32) animationLimit = 32;
 
 	if (animationLimit > 32) {

sfall/Modules/Credits.cpp

@@ -161,7 +161,7 @@ static void __declspec(naked) CreditsNextLineHook_Bottom() {
 
 void Credits::init() {
 	HookCalls(ShowCreditsHook, {0x480C49, 0x43F881});
-	if (GetConfigInt("Misc", "CreditsAtBottom", 0)) {
+	if (IniReader::GetConfigInt("Main", "CreditsAtBottom", 0)) {
 		HookCall(0x42CB49, CreditsNextLineHook_Bottom);
 	} else {
 		HookCall(0x42CB49, CreditsNextLineHook_Top);

sfall/Modules/ScriptExtender.cpp

@@ -431,6 +431,7 @@ void __fastcall SetSelfObject(fo::Program* script, fo::GameObject* obj) {
 
 // loads script from .int file into a sScriptProgram struct, filling script pointer and proc lookup table
 void InitScriptProgram(ScriptProgram &prog, const char* fileName, bool fullPath) {
+	prog.initialized = false;
 	fo::Program* scriptPtr = (fullPath)
 	                       ? fo::func::allocateProgram(fileName)
 	                       : fo::func::loadProgram(fileName);
@@ -442,14 +443,13 @@ void InitScriptProgram(ScriptProgram &prog, const char* fileName, bool fullPath)
 		for (int i = 0; i < fo::Scripts::ScriptProc::count; ++i) {
 			prog.procLookup[i] = fo::func::interpretFindProcedure(prog.ptr, procTable[i]);
 		}
-		prog.initialized = false;
 	} else {
 		prog.ptr = nullptr;
 	}
 }
 
 void RunScriptProgram(ScriptProgram &prog) {
-	if (!prog.initialized) {
+	if (!prog.initialized && prog.ptr) {
 		fo::func::runProgram(prog.ptr);
 		fo::func::interpret(prog.ptr, -1);
 		prog.initialized = true;
@@ -565,8 +565,8 @@ static void PrepareGlobalScriptsListByMask() {
 			}
 		}
 		fo::func::db_free_file_list(&filenames, 0);
-		globalScripts.reserve(globalScriptFilesList.size());
 	}
+	globalScripts.reserve(globalScriptFilesList.size());
 }
 
 // this runs before the game was loaded/started

sfall/Modules/SpeedPatch.cpp

@@ -176,6 +176,8 @@ void TimerInit() {
 	GetLocalTime(&time);
 	SystemTimeToFileTime(&time, (FILETIME*)&startTime);
 
+	if (!modKey[0]) return;
+
 	speed = new SpeedCfg[10];
 
 	char buf[2], spKey[10] = "SpeedKey#";
@@ -189,45 +191,46 @@ void TimerInit() {
 }
 
 void SpeedPatch::init() {
+	int init = IniReader::GetConfigInt("Speed", "SpeedMultiInitial", 100);
+
 	if (IniReader::GetConfigInt("Speed", "Enable", 0)) {
 		modKey[0] = IniReader::GetConfigInt("Input", "SpeedModKey", 0);
-		int init = IniReader::GetConfigInt("Speed", "SpeedMultiInitial", 100);
-		if (init == 100 && !modKey[0]) return;
-
-		dlog("Applying speed patch.", DL_INIT);
-
-		switch (modKey[0]) {
-		case -1:
-			modKey[0] = DIK_LCONTROL;
-			modKey[1] = DIK_RCONTROL;
-			break;
-		case -2:
-			modKey[0] = DIK_LMENU;
-			modKey[1] = DIK_RMENU;
-			break;
-		case -3:
-			modKey[0] = DIK_LSHIFT;
-			modKey[1] = DIK_RSHIFT;
-			break;
-		default:
-			modKey[1] = 0;
-		}
-
-		multi = init / 100.0f;
 		toggleKey = IniReader::GetConfigInt("Input", "SpeedToggleKey", 0);
+	}
+	if (init == 100 && !modKey[0]) return;
+
+	dlog("Applying speed patch.", DL_INIT);
+
+	switch (modKey[0]) {
+	case -1:
+		modKey[0] = DIK_LCONTROL;
+		modKey[1] = DIK_RCONTROL;
+		break;
+	case -2:
+		modKey[0] = DIK_LMENU;
+		modKey[1] = DIK_RMENU;
+		break;
+	case -3:
+		modKey[0] = DIK_LSHIFT;
+		modKey[1] = DIK_RSHIFT;
+		break;
+	default:
+		modKey[1] = 0;
+	}
 
-		getTickCountOffs = (DWORD)&FakeGetTickCount;
-		getLocalTimeOffs = (DWORD)&FakeGetLocalTime;
+	multi = init / 100.0f;
 
-		for (int i = 0; i < sizeof(offsets) / 4; i++) {
-			SafeWrite32(offsets[i], (DWORD)&getTickCountOffs);
-		}
-		SafeWrite32(0x4FDF58, (DWORD)&getLocalTimeOffs);
-		HookCall(0x4A433E, scripts_check_state_hook);
+	getTickCountOffs = (DWORD)&FakeGetTickCount;
+	getLocalTimeOffs = (DWORD)&FakeGetLocalTime;
 
-		TimerInit();
-		dlogr(" Done", DL_INIT);
+	for (int i = 0; i < sizeof(offsets) / 4; i++) {
+		SafeWrite32(offsets[i], (DWORD)&getTickCountOffs);
 	}
+	SafeWrite32(0x4FDF58, (DWORD)&getLocalTimeOffs);
+	HookCall(0x4A433E, scripts_check_state_hook);
+
+	TimerInit();
+	dlogr(" Done", DL_INIT);
 }
 
 void SpeedPatch::exit() {

sfall/SafeWrite.cpp

@@ -24,9 +24,10 @@ static __declspec(noinline) void __stdcall SafeWriteFunc(uint8_t code, uint32_t
 	*((BYTE*)addr) = code;
 	*((DWORD*)(addr + 1)) = data;
 
-	for (size_t i = 0; i < len; i++) {
-		*((BYTE*)(addrMem + i)) = CodeType::Nop;
-	}
+	do {
+		*(BYTE*)addrMem++ = CodeType::Nop;
+	} while (--len);
+
 	VirtualProtect((void*)addr, protectLen, oldProtect, &oldProtect);
 
 	CheckConflict(addr, protectLen);