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

Fixed cur_town function on new game start (#366)

Browse Source
This commit is contained in:
NovaRain
2021-04-13 12:17:58 +08:00
parent 0b868593e0
commit fb3070fdfb
3 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine.h
+1
View File
@@ -301,6 +301,7 @@
#define FO_VAR_wmBkWinBuf 0x51DE24
#define FO_VAR_wmEncounterIconShow 0x672E48
#define FO_VAR_wmLastRndTime 0x51DEA0
#define FO_VAR_wmMaxAreaNum 0x51DDFC
#define FO_VAR_wmMaxMapNum 0x51DE10
#define FO_VAR_wmMsgFile 0x672FB0
#define FO_VAR_wmNumHorizontalTiles 0x51DDF4
sfall/FalloutFuncOffs_def.h
+2
View File
@@ -339,6 +339,7 @@ FUNC(map_disable_bk_processes_, 0x482104)
FUNC(map_enable_bk_processes_, 0x4820C0)
FUNC(map_exit_, 0x482084)
FUNC(map_get_short_name_, 0x48261C)
FUNC(map_load_, 0x482A68)
FUNC(map_load_idx_, 0x482B34)
FUNC(mem_free_, 0x4C5C24)
FUNC(mem_malloc_, 0x4C5AD0)
@@ -591,6 +592,7 @@ FUNC(wmPartyInitWalking_, 0x4C1E54)
FUNC(wmPartyWalkingStep_, 0x4C1F90)
FUNC(wmRefreshInterfaceOverlay_, 0x4C50F4)
FUNC(wmSubTileMarkRadiusVisited_, 0x4C35A8)
FUNC(wmTeleportToArea_, 0x4C5A1C)
FUNC(wmWorldMapFunc_, 0x4BFE10)
FUNC(wmWorldMapLoadTempData_, 0x4BD6B4)
FUNC(xfclose_, 0x4DED6C)
sfall/Worldmap.cpp
+49 -13
View File
@@ -284,6 +284,30 @@ skip:
}
}
static bool customPosition = false;
static void __declspec(naked) main_load_new_hook() {
__asm {
call map_load_;
push -1;
mov edx, esp;
mov eax, dword ptr ds:[FO_VAR_map_number];
call wmMatchAreaContainingMapIdx_;
pop eax; // area ID
cmp customPosition, 0;
jnz skip;
jmp wmTeleportToArea_;
skip:
test eax, eax;
js end;
cmp eax, dword ptr ds:[FO_VAR_wmMaxAreaNum];
jge end;
mov dword ptr ds:[FO_VAR_WorldMapCurrArea], eax;
end:
retn;
}
}
static void WorldLimitsPatches() {
DWORD data = GetConfigInt("Misc", "LocalMapXLimit", 0);
if (data) {
@@ -406,34 +430,46 @@ static void StartingStatePatches() {
dlogr(" Done", DL_INIT);
}
date = GetConfigInt("Misc", "StartXPos", -1);
if (date != -1) {
long xPos = GetConfigInt("Misc", "StartXPos", -1);
if (xPos != -1) {
if (xPos < 0) xPos = 0;
dlog("Applying starting x position patch.", DL_INIT);
SafeWrite32(0x4BC990, date);
SafeWrite32(0x4BCC08, date);
SafeWrite32(0x4BC990, xPos);
SafeWrite32(0x4BCC08, xPos);
dlogr(" Done", DL_INIT);
customPosition = true;
}
date = GetConfigInt("Misc", "StartYPos", -1);
if (date != -1) {
long yPos = GetConfigInt("Misc", "StartYPos", -1);
if (yPos != -1) {
if (yPos < 0) yPos = 0;
dlog("Applying starting y position patch.", DL_INIT);
SafeWrite32(0x4BC995, date);
SafeWrite32(0x4BCC0D, date);
SafeWrite32(0x4BC995, yPos);
SafeWrite32(0x4BCC0D, yPos);
dlogr(" Done", DL_INIT);
customPosition = true;
}
ViewportX = GetConfigInt("Misc", "ViewXPos", -1);
if (ViewportX != -1) {
// Fix the starting position of the player's marker on the world map when starting a new game
// also initialize the value of the current area for METARULE_CURRENT_TOWN metarule function
HookCall(0x480DC0, main_load_new_hook);
xPos = GetConfigInt("Misc", "ViewXPos", -1);
if (xPos != -1) {
if (xPos < 0) xPos = 0;
ViewportX = xPos;
dlog("Applying starting x view patch.", DL_INIT);
SafeWrite32(FO_VAR_wmWorldOffsetX, ViewportX);
dlogr(" Done", DL_INIT);
}
ViewportY = GetConfigInt("Misc", "ViewYPos", -1);
if (ViewportY != -1) {
yPos = GetConfigInt("Misc", "ViewYPos", -1);
if (yPos != -1) {
if (yPos < 0) yPos = 0;
ViewportY = yPos;
dlog("Applying starting y view patch.", DL_INIT);
SafeWrite32(FO_VAR_wmWorldOffsetY, ViewportY);
dlogr(" Done", DL_INIT);
}
if (ViewportX != -1 || ViewportY != -1) HookCall(0x4BCF07, ViewportHook); // game_reset_
if (xPos != -1 || yPos != -1) HookCall(0x4BCF07, ViewportHook); // game_reset_
}
static void PipBoyAutomapsPatch() {