Combined AllowDShowSound=2 with mode 1

Removed MoreTiles from ddraw.ini (always enabled)
Minor edits to documents.
This commit is contained in:
NovaRain
2022-08-08 09:10:53 +08:00
parent c9712f75ee
commit b0fa170ffd
5 changed files with 9 additions and 11 deletions
+1 -1
View File
@@ -10,4 +10,4 @@
;in the proto for other items, so AI will use them for healing in combat as well
STIMPAK=40
SUPER_STIMPAK=144
HEALING_POWDER=237
HEALING_POWDER=273
+3 -2
View File
@@ -108,7 +108,7 @@ NumSoundBuffers=8
AllowSoundForFloats=0
;Set to 1 to automatically search for alternative formats (mp3/wma/wav) when Fallout tries to play an ACM
;Set to 2 to play alternative music files even if original ACM files are not present in the music folder
;Alternative music files will play even if original ACM files are not present in the music folder
;This does not effect the play_sfall_sound and stop_sfall_sound script functions
AllowDShowSound=0
@@ -443,7 +443,8 @@ NPCsTryToSpendExtraAP=0
AllowLargeTiles=0
;Set to 1 to boost the maximum number of tile FRMs from 4096 to 16383
MoreTiles=0
;This option is always enabled in 4.3.6.1/3.8.36.1 or later. The information is left for reference only
MoreTiles=1
;Change the Skilldex cursor FRM numbers
;Default is 293 for all skills
+1 -1
View File
@@ -79,7 +79,7 @@ Syntax which requires sfall for compiled scripts to be interpreted is marked by
- Conditional expressions (Python-inspired), also known as ternary operator:
- new:
```
X := value1 if condition else value2
X := value1 if (condition) else value2
```
- old:
```
+2 -5
View File
@@ -1008,15 +1008,12 @@ void Sound::init() {
void* soundLoad_func = soundLoad_hook_B;
int allowDShowSound = IniReader::GetConfigInt("Sound", "AllowDShowSound", 0);
if (allowDShowSound > 0) {
if (IniReader::GetConfigInt("Sound", "AllowDShowSound", 0)) {
soundLoad_func = soundLoad_hook_A; // main hook
const DWORD gmoviePlayStopAddr[] = {0x44E80A, 0x445280};
HookCalls(gmovie_play_hook_stop, gmoviePlayStopAddr); // only play looping music
if (allowDShowSound > 1) {
HookCall(0x450851, gsound_background_play_hook);
}
HookCall(0x450851, gsound_background_play_hook);
HookCall(0x4813EE, main_death_scene_hook);
MakeCall(0x451038, gsound_speech_stop_hack, 1);
+2 -2
View File
@@ -314,7 +314,7 @@ void Tiles::init() {
dlogr(" Done", DL_INIT);
}
if (IniReader::GetConfigInt("Misc", "MoreTiles", 0)) {
//if (IniReader::GetConfigInt("Misc", "MoreTiles", 1)) {
dlog("Applying tile FRM limit patch.", DL_INIT);
MakeCall(0x419D46, art_id_hack);
MakeCall(0x419479, art_get_name_hack);
@@ -327,7 +327,7 @@ void Tiles::init() {
SafeWrite8(HRPAddress(0x1000E1DA), 0x3F); // and esi, 0x3FFF
}
dlogr(" Done", DL_INIT);
}
//}
}
void Tiles::exit() {