From 89f454e825ad8ec3efc12398249a2a9466e86930 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Wed, 25 May 2022 21:41:31 +0800 Subject: [PATCH] Removed ComputeSprayMod from ddraw.ini Updated version number. --- artifacts/ddraw.ini | 17 +++++++---------- sfall/Modules/Animations.cpp | 2 +- sfall/Modules/BurstMods.cpp | 7 +++---- sfall/Modules/Scripting/Opcodes.cpp | 3 +-- sfall/version.h | 6 +++--- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index f25351bf..efe61017 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -1,5 +1,5 @@ ;sfall configuration settings -;v3.8.34.1 +;v3.8.35 [Main] ;Set to 1 if you want to use command line arguments to tell sfall to use another ini file @@ -579,15 +579,12 @@ SuperStimExploitFix=0 InventoryApCost=4 QuickPocketsApCostReduction=2 -;Set to 1 to enable the balanced bullet distribution formula for burst attacks -ComputeSprayMod=0 - -;These options modify the bullet distribution of burst attacks if ComputeSprayMod is 1 -;All the bullets are divided into three groups: central, left and right -;These three groups will then travel along three parallel tracks, trying to hit targets on the way -;CenterMult/Div set the ratio of how many bullets go to the central group, and remaining bullets are divided equally to left and right sides -;TargetMult/Div set the ratio of how many bullets in the central group will attack the primary target directly -;Multipliers are capped at divisor values +;These options modify the bullet distribution of burst attacks +;All the bullets are divided into three groups: center, left, and right +;These groups will then travel along three parallel tracks, trying to hit targets on the way +;CenterMult/Div set the ratio of how many bullets go to the center group, and the remaining are divided equally to the left and right sides +;TargetMult/Div set the ratio of how many bullets in the center group will attack the primary target directly +;Multiplier values are capped at divisor values ComputeSpray_CenterMult=1 ComputeSpray_CenterDiv=3 ComputeSpray_TargetMult=1 diff --git a/sfall/Modules/Animations.cpp b/sfall/Modules/Animations.cpp index d47fd2c1..8248bdc1 100644 --- a/sfall/Modules/Animations.cpp +++ b/sfall/Modules/Animations.cpp @@ -567,7 +567,7 @@ void Animations::OnGameLoad() { } void Animations::init() { - animationLimit = IniReader::GetConfigInt("Misc", "AnimationsAtOnceLimit", 32); + animationLimit = IniReader::GetConfigInt("Misc", "AnimationsAtOnceLimit", sfall::animationLimit); if (animationLimit < 32) animationLimit = 32; if (animationLimit > 32) { if (animationLimit > 127) animationLimit = 127; diff --git a/sfall/Modules/BurstMods.cpp b/sfall/Modules/BurstMods.cpp index 7d4f7262..efd0e307 100644 --- a/sfall/Modules/BurstMods.cpp +++ b/sfall/Modules/BurstMods.cpp @@ -17,7 +17,6 @@ */ #include "..\main.h" -#include "..\Logging.h" #include "BurstMods.h" @@ -67,8 +66,8 @@ static void __declspec(naked) compute_spray_rounds_distribution() { } void BurstMods::init() { - if (IniReader::GetConfigInt("Misc", "ComputeSprayMod", 0)) { - dlog("Applying ComputeSpray changes.", DL_INIT); + //if (IniReader::GetConfigInt("Misc", "ComputeSprayMod", 0)) { + dlog("Applying ComputeSpray settings to burst attacks.", DL_INIT); compute_spray_center_mult = IniReader::GetConfigInt("Misc", "ComputeSpray_CenterMult", 1); compute_spray_center_div = IniReader::GetConfigInt("Misc", "ComputeSpray_CenterDiv", 3); if (compute_spray_center_div < 1) { @@ -87,7 +86,7 @@ void BurstMods::init() { } MakeJump(0x4234F1, compute_spray_rounds_distribution); dlogr(" Done", DL_INIT); - } + //} } } diff --git a/sfall/Modules/Scripting/Opcodes.cpp b/sfall/Modules/Scripting/Opcodes.cpp index c359a808..ee6f1c62 100644 --- a/sfall/Modules/Scripting/Opcodes.cpp +++ b/sfall/Modules/Scripting/Opcodes.cpp @@ -210,6 +210,7 @@ static SfallOpcodeInfo opcodeInfoArray[] = { {0x267, "round", op_round, 1, true, 0, {ARG_NUMBER}}, // 0x268 RESERVED // 0x269 RESERVED + // 0x26a RESERVED {0x26b, "message_str_game", op_message_str_game, 2, true, 0, {ARG_INT, ARG_INT}}, {0x26c, "sneak_success", op_sneak_success, 0, true}, {0x26d, "tile_light", op_tile_light, 2, true, -1, {ARG_INT, ARG_INT}}, @@ -416,8 +417,6 @@ void Opcodes::InitNew() { opcodes[0x24c] = op_gdialog_get_barter_mod; opcodes[0x24d] = op_set_inven_ap_cost; - //opcodes[0x26a]=op_game_ui_redraw; - // configure default opcode handler for (int i = sfallOpcodeStart; i < opcodeCount; i++) { if (opcodes[i] == nullptr) { diff --git a/sfall/version.h b/sfall/version.h index 4a993b1b..d8206141 100644 --- a/sfall/version.h +++ b/sfall/version.h @@ -24,7 +24,7 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 8 -#define VERSION_BUILD 34 -#define VERSION_REV 1 +#define VERSION_BUILD 35 +#define VERSION_REV 0 -#define VERSION_STRING "3.8.34.1" +#define VERSION_STRING "3.8.35"