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

Removed ArraysBehavior and RemoveWindowRounding from ddraw.ini

Browse Source 
* both are now always enabled
This commit is contained in:
NovaRain
2022-01-07 06:47:49 +08:00
parent be7c1210a0
commit 52126bf62d
5 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
-7
View File
@@ -456,9 +456,6 @@ Doctor=293
Science=293
Repair=293
;Set to 1 to remove window position rounding for script-created windows
RemoveWindowRounding=1
;Set to 1 to add scroll buttons to the pipboy quest list, and remove the quests per area limit
;Set to 2 to use a different set of scroll buttons
UseScrollingQuestsList=1
@@ -613,10 +610,6 @@ ExplosionsEmitLight=0
;MovieTimer_artimer3=270
;MovieTimer_artimer4=360
;Set to 1 to enable the new arrays behavior (default behavior)
;Set to 0 for backward compatibility with pre-3.4 scripts
ArraysBehavior=1
;Set to 1 to add proper check for ammo before attacking and proper calculation of the number of burst rounds
;By default, weapons can make attacks when at least one ammo is left, regardless of ammo cost calculations
;Note that enabling this option will prevent super cattle prods and mega power fists from attacking with only one ammo left
sfall/Modules/Interface.cpp
+2 -2
View File
@@ -681,10 +681,10 @@ void Interface::init() {
InventoryCharacterRotationSpeedPatch();
UIAnimationSpeedPatch();
if (IniReader::GetConfigInt("Misc", "RemoveWindowRounding", 1)) {
//if (IniReader::GetConfigInt("Misc", "RemoveWindowRounding", 1)) {
const DWORD windowRoundingAddr[] = {0x4D6EDD, 0x4D6F12};
SafeWriteBatch<BYTE>(CodeType::JumpShort, windowRoundingAddr);
}
//}
DrawActionPointsNumber();
WorldMapInterfacePatch();
sfall/Modules/ScriptExtender.cpp
-8
View File
@@ -1178,14 +1178,6 @@ void ScriptExtender::init() {
idle = IniReader::GetConfigInt("Misc", "ProcessorIdle", -1);
if (idle > -1 && idle > 30) idle = 30;
arraysBehavior = IniReader::GetConfigInt("Misc", "ArraysBehavior", 1);
if (arraysBehavior > 0) {
arraysBehavior = 1; // only 1 and 0 allowed at this time
dlogr("New arrays behavior enabled.", DL_SCRIPT);
} else {
dlogr("Arrays in backward-compatiblity mode.", DL_SCRIPT);
}
alwaysFindScripts = isDebug && (IniReader::GetIntDefaultConfig("Debugging", "AlwaysFindScripts", 0) != 0);
if (alwaysFindScripts) dlogr("Always searching for global scripts behavior enabled.", DL_SCRIPT);
sfall/Modules/Scripting/Arrays.cpp
+5 -5
View File
@@ -15,7 +15,7 @@ namespace script
/*
GLOBAL variable for arrays
*/
DWORD arraysBehavior = 1; // 0 - backward compatible with pre-3.4, 1 - permanent arrays don't get stored in savegames by default
//DWORD arraysBehavior = 1; // 0 - backward compatible with pre-3.4, 1 - permanent arrays don't get stored in savegames by default
// arrays map: arrayId => arrayVar
ArraysMap arrays;
@@ -400,10 +400,10 @@ DWORD CreateArray(int len, DWORD flags) {
while (ArrayExists(nextArrayID)) nextArrayID++;
if (nextArrayID == 0) nextArrayID++;
if (arraysBehavior == 0) {
var.key = sArrayElement(nextArrayID, DATATYPE_INT);
savedArrays[var.key] = nextArrayID;
}
//if (arraysBehavior == 0) {
// var.key = sArrayElement(nextArrayID, DATATYPE_INT);
// savedArrays[var.key] = nextArrayID;
//}
stackArrayId = nextArrayID;
arrays[nextArrayID] = var;
return nextArrayID++;
sfall/Modules/Scripting/Arrays.h
-2
View File
@@ -152,8 +152,6 @@ typedef std::pair<DWORD, sArrayVar> array_pair;
// auto-incremented ID
extern DWORD nextArrayID;
extern DWORD arraysBehavior;
// saved arrays: arrayKey => arrayId
extern ArrayKeysMap savedArrays;