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

Updated code for the interface bar (WIP)

Browse Source
This commit is contained in:
NovaRain
2021-11-14 09:36:29 +08:00
parent e7add0d1b4
commit ae05feee8c
7 changed files with 430 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine/Functions_def.h
+1 -3
View File
@@ -72,10 +72,8 @@ WRAP_WATCOM_FFUNC4(void, wmInterfaceDrawSubTileRectFogged, BYTE*, surface, long,
WRAP_WATCOM_FFUNC3(const char*, interpretGetString, fo::Program*, scriptPtr, DWORD, dataType, DWORD, strId)
//
//WRAP_WATCOM_FFUNC6(void, drawScaledBuf, BYTE*, dst, long, dstW, long, dstH, const BYTE*, src, long, w, long, h)
WRAP_WATCOM_FFUNC8(void, cscale, BYTE*, src, long, sWidth, long, sHeight, long, sStride, BYTE*, dst, long, width, long, height, long, stride)
/* stdcall */
WRAP_WATCOM_FUNC1(fo::AIcap*, ai_cap, fo::GameObject*, critter)
sfall/FalloutEngine/VariableOffsets.h
+2
View File
@@ -78,6 +78,7 @@
#define FO_VAR_dialogueWindow 0x518744
#define FO_VAR_disp_curr 0x56FB48
#define FO_VAR_disp_init 0x51850C
#define FO_VAR_disp_rect 0x518510
#define FO_VAR_disp_start 0x56FB54
#define FO_VAR_display_buf 0x631D50
#define FO_VAR_display_string_buf 0x56DBFC
@@ -151,6 +152,7 @@
#define FO_VAR_In_WorldMap 0x672E1C
#define FO_VAR_info_line 0x5707D0
#define FO_VAR_interfaceWindow 0x519024
#define FO_VAR_intface_full_wid 0x56FB4C
#define FO_VAR_intfaceEnabled 0x518F10
#define FO_VAR_intotal 0x43E95C
#define FO_VAR_inven_dude 0x519058
sfall/FalloutEngine/Variables_def.h
+1
View File
@@ -51,6 +51,7 @@ VAR_(dialog_target_is_party, DWORD)
VAR_(dialogue_state, DWORD)
VAR_(dialogue_switch_mode, DWORD)
VARC(dialogueBackWindow, DWORD)
VAR_(disp_rect, fo::BoundRect)
VAR_(dropped_explosive, DWORD)
VARA(drugInfoList, fo::DrugInfoList, 9)
VAR_(DullPinkColor, BYTE)
sfall/Game/GUI/Text.cpp
+49 -27
View File
@@ -9,6 +9,9 @@
#include "..\..\Modules\Console.h"
#include "..\..\HRP\Init.h"
#include "..\..\HRP\InterfaceBar.h"
#include "Text.h"
namespace game
@@ -51,22 +54,21 @@ static long GetPositionWidth(const char* text, long width) {
// Replaces the implementation of display_print_ function from HRP with support for the newline control character '\n'
// Works with vanilla and HRP 4.1.8
static void __fastcall DisplayPrintLineBreak(const char* message) {
static void __fastcall DisplayPrint(const char* message, bool lineBreak) {
if (*message == 0 || !fo::var::getInt(FO_VAR_disp_init)) return;
sfall::Console::PrintFile(message);
const long max_lines = 100; // aka FO_VAR_max
long max_disp_chars = 256; // HRP value (vanilla 80)
char* display_string_buf_addr;
char* display_string_buf_addr = sf::IFaceBar::display_string_buf; // array size: 100x80 (or 100x256 for sfall HRP)
long width = (sf::hrpIsEnabled) ? sf::GetIntHRPValue(HRP_VAR_disp_width) : 0;
long width = (sf::hrpIsEnabled) ? sf::GetIntHRPValue(HRP_VAR_disp_width) : sf::IFaceBar::display_width;
if (width == 0) {
width = 167; // vanilla size
max_disp_chars = 80;
display_string_buf_addr = (char*)FO_VAR_display_string_buf; // array size 100x80
} else {
display_string_buf_addr = (char*)sf::HRPAddress(HRP_VAR_display_string_buf); // array size 100x256, allocated by HRP
} else if (sfall::hrpIsEnabled) {
display_string_buf_addr = (char*)sf::HRPAddress(HRP_VAR_display_string_buf); // array size 100x256, allocated by Mash's HRP
}
if (!(fo::var::combat_state & fo::CombatStateFlag::InCombat)) {
@@ -101,7 +103,7 @@ static void __fastcall DisplayPrintLineBreak(const char* message) {
if (message[pos] == ' ') {
pos++;
} else if (message[pos] == '\\' && message[pos + 1] == 'n') {
} else if (lineBreak && message[pos] == '\\' && message[pos + 1] == 'n') {
pos += 2; // position after the 'n' character
}
message += pos;
@@ -115,11 +117,25 @@ static void __fastcall DisplayPrintLineBreak(const char* message) {
__asm call fo::funcoffs::display_redraw_;
}
static void __declspec(naked) sf_display_print() {
static void __declspec(naked) display_print_hack_replacemet() {
__asm {
push ecx;
push edx;
mov ecx, eax; // message
call DisplayPrintLineBreak;
xor edx, edx;
call DisplayPrint;
pop edx;
pop ecx;
retn;
}
}
static void __declspec(naked) display_print_line_break() {
__asm {
push ecx;
mov dl, 1; // with line break
mov ecx, eax; // message
call DisplayPrint;
pop ecx;
retn;
}
@@ -148,18 +164,7 @@ static void __stdcall SplitPrintMessage(char* message, void* printFunc) {
}
}
static void __declspec(naked) sf_display_print_alt() {
__asm {
push ecx;
push fo::funcoffs::display_print_;
push eax; // message
call SplitPrintMessage;
pop ecx;
retn;
}
}
static void __declspec(naked) sf_inven_display_msg() {
static void __declspec(naked) inven_display_msg_line_break() {
__asm {
push ecx;
push fo::funcoffs::inven_display_msg_;
@@ -170,14 +175,31 @@ static void __declspec(naked) sf_inven_display_msg() {
}
}
void Text::init() {
// Support for the newline control character '\n' in the object description in pro_*.msg files
void* printFunc = sf_display_print; // for vanilla and HRP 4.1.8
if (sf::hrpIsEnabled && !sf::hrpVersionValid) {
printFunc = sf_display_print_alt;
static void __declspec(naked) display_print_line_break_extHRP() {
__asm {
push ecx;
push fo::funcoffs::display_print_; // func replaced by Mash HRP
push eax; // message
call SplitPrintMessage;
pop ecx;
retn;
}
}
void Text::init() {
void* printFunc = display_print_line_break; // for vanilla and HRP 4.1.8
if (sf::HRP::Enabled) {
sf::MakeJump(fo::funcoffs::display_print_, display_print_hack_replacemet); // 0x43186C
} else {
if (sf::hrpIsEnabled && !sf::hrpVersionValid) {
printFunc = display_print_line_break_extHRP;
}
}
// Support for the newline control character '\n' in the object description in pro_*.msg files
sf::SafeWriteBatch<DWORD>((DWORD)printFunc, {0x46ED87, 0x49AD7A}); // setup_inventory_, obj_examine_
sf::SafeWrite32(0x472F9A, (DWORD)&sf_inven_display_msg); // inven_obj_examine_func_
sf::SafeWrite32(0x472F9A, (DWORD)&inven_display_msg_line_break); // inven_obj_examine_func_
}
}
sfall/HRP/Init.cpp
+60
View File
@@ -58,7 +58,62 @@ bool HRP::CheckExternalPatch() {
return isEnabled;
}
static void __declspec(naked) mem_copy() {
__asm {
cmp edx, eax;
jz end;
push ecx;
push esi;
push edi;
mov ecx, ebx;
jnb forward;
lea esi, [edx + ecx];
// and ebx, 3;
cmp esi, eax;
jbe forward; // src <= dst
// backward copy
dec esi; //lea esi, [edi - 1];
lea edi, [eax + ecx]; // dst + num
std;
dec edi;
dec esi;
dec edi;
shr ecx, 1;
rep movsw;
adc ecx, ecx;
inc esi;
inc edi;
// mov ecx, ebx;
rep movsb
cld;
pop edi;
pop esi;
pop ecx;
end:
retn;
forward:
and ebx, 3;
mov esi, edx;
mov edi, eax;
shr ecx, 2;
rep movsd;
mov ecx, ebx;
rep movsb;
pop edi;
pop esi;
pop ecx;
retn;
}
}
void HRP::init() {
//HookCall(0x482899, mem_copy);
//SafeWrite16(0x4B2EA8, 0x9090); // _show_grid
if (!hrpIsEnabled && IniReader::GetIntDefaultConfig("Main", "HiResMode", 1) == 0) return; // vanilla game mode
@@ -104,6 +159,11 @@ void HRP::init() {
ViewMap::IGNORE_MAP_EDGES = (IniReader::GetInt("MAPS", "IGNORE_MAP_EDGES", 0, f2ResIni) != 0);
ViewMap::EDGE_CLIPPING_ON = (IniReader::GetInt("MAPS", "EDGE_CLIPPING_ON", 1, f2ResIni) != 0);
IFaceBar::IFACE_BAR_MODE = IniReader::GetInt("IFACE", "IFACE_BAR_MODE", 0, f2ResIni);
IFaceBar::IFACE_BAR_SIDE_ART = IniReader::GetInt("IFACE", "IFACE_BAR_SIDE_ART", 2, f2ResIni);
IFaceBar::IFACE_BAR_WIDTH = IniReader::GetInt("IFACE", "IFACE_BAR_WIDTH", (SCR_WIDTH >= 800) ? 800 : 640, f2ResIni);
IFaceBar::IFACE_BAR_SIDES_ORI = IniReader::GetInt("IFACE", "IFACE_BAR_SIDES_ORI", 0, f2ResIni);
Dialog::DIALOG_SCRN_ART_FIX = (IniReader::GetInt("OTHER_SETTINGS", "DIALOG_SCRN_ART_FIX", 1, f2ResIni) != 0);
Dialog::DIALOG_SCRN_BACKGROUND = (IniReader::GetInt("OTHER_SETTINGS", "DIALOG_SCRN_BACKGROUND", 0, f2ResIni) != 0);
sfall/HRP/InterfaceBar.cpp
+307 -6
View File
@@ -8,20 +8,87 @@
#include "..\FalloutEngine\Fallout2.h"
#include "Init.h"
//#include "Image.h"
#include "InterfaceBar.h"
namespace sfall
{
long xPosition;
long IFaceBar::IFACE_BAR_MODE; // 1 - the bottom of the map view window extends to the base of the screen and is overlapped by the IFACE Bar
long IFaceBar::IFACE_BAR_SIDE_ART;
long IFaceBar::IFACE_BAR_WIDTH;
long IFaceBar::IFACE_BAR_SIDES_ORI; // 1 - Iface-bar side graphics extend from the Screen edges to the Iface-Bar
static long __fastcall intface_init_win_add(long height, long yPos, long xPos, long width, long color, long flags) {
yPos += HRP::ScreenHeight() - 480; // yPos:379 = 479-100
static long xPosition;
static long yPosition;
static long xOffset;
static long xyOffsetAP;
bool IFaceBar::UseExpandAPBar = false;
long IFaceBar::display_width = 0; // width of the area for text output
char* IFaceBar::display_string_buf = (char*)FO_VAR_display_string_buf;
static class Panels {
long leftBarID;
long rightBarID;
void LoadFRMImage(char* name, long winId) {
auto* frm = fo::util::LoadUnlistedFrm(name, fo::ArtType::OBJ_TYPE_INTRFACE);
if (!frm) return;
fo::Window* win = fo::func::GNW_find(winId);
long width = win->width;
if (width > frm->frames->width) width = frm->frames->width;
BYTE* scr = frm->frames->indexBuff;
if (win->wRect.left <= 0) scr += (frm->frames->width - win->width); // set the position to the right side
fo::func::cscale(scr, width, frm->frames->height, frm->frames->width, win->surface, win->width, win->height, win->width);
delete frm;
}
public:
Panels(long idL, long idR) : leftBarID(idL), rightBarID(idR)
{
char file[33];
std::sprintf(file, "HR_IFACELFT%d.frm", IFaceBar::IFACE_BAR_SIDE_ART);
LoadFRMImage(file, leftBarID);
std::sprintf(file, "HR_IFACERHT%d.frm", IFaceBar::IFACE_BAR_SIDE_ART);
LoadFRMImage(file, rightBarID);
}
void Show() {
fo::func::win_show(leftBarID);
fo::func::win_show(rightBarID);
}
void Hide() {
fo::func::win_hide(leftBarID);
fo::func::win_hide(rightBarID);
}
} *panels;
static long __fastcall IntfaceWinCreate(long height, long yPos, long xPos, long width, long color, long flags) {
if (width != IFaceBar::IFACE_BAR_WIDTH) width = IFaceBar::IFACE_BAR_WIDTH;
yPos += HRP::ScreenHeight() - 479; // yPos:379 = 479-100
xPos += (HRP::ScreenWidth() - width) / 2;
xPosition = xPos;
return fo::func::win_add(xPos, yPos, width, height, color, flags);
xPosition = xPos;
yPosition = yPos;
if (IFaceBar::IFACE_BAR_MODE == 0 && IFaceBar::IFACE_BAR_SIDE_ART && HRP::ScreenWidth() > IFaceBar::IFACE_BAR_WIDTH) {
long leftID = fo::func::win_add(0, yPos, xPos, height, 0, flags);
long rightID = fo::func::win_add(xPos + width, yPos, HRP::ScreenWidth() - (xPos + width), height, 0, flags);
panels = new Panels(leftID, rightID);
}
return fo::func::win_add(xPos, yPos, width, height, 55, flags);
}
static void __declspec(naked) intface_init_hook_win_add() {
@@ -30,12 +97,246 @@ static void __declspec(naked) intface_init_hook_win_add() {
push ebx; // width
push eax; // xPos
push ebp;
jmp intface_init_win_add;
jmp IntfaceWinCreate;
}
}
static void __fastcall InterfaceShow(long winID) {
fo::func::win_show(winID);
if (panels) panels->Show();
}
static void __declspec(naked) intface_show_hook_win_show() {
__asm {
push ecx;
push edx;
mov ecx, eax;
call InterfaceShow;
pop edx;
pop ecx;
retn;
}
}
static void __fastcall InterfaceHide(long winID) {
fo::func::win_hide(winID);
if (panels) panels->Hide();
}
static void __declspec(naked) intface_win_hide() {
__asm {
push ecx;
push edx;
mov ecx, eax;
call InterfaceHide;
pop edx;
pop ecx;
retn;
}
}
static void __declspec(naked) refresh_box_bar_win_hook_win_add() {
__asm {
lea edx, [edx - 358 - 21];
add eax, xPosition;
add edx, yPosition;
jmp fo::funcoffs::win_add_;
}
}
static void __declspec(naked) skilldex_start_hook_win_add() {
__asm {
lea eax, [eax - 640];
add eax, xPosition;
lea edx, [edx - 379];
add eax, IFaceBar::IFACE_BAR_WIDTH;
add edx, yPosition;
jmp fo::funcoffs::win_add_;
}
}
// Scales the interface image to the width of IFACE_BAR_WIDTH
// exception: the first 30 pixels and the tail of 460 pixels wide are not scaled
static void InterfaceArtScale(BYTE* scr, long w, long h, BYTE* dst, long dh) {
// copy the beginning with a width of 30 pixels
fo::func::buf_to_buf(scr, 30, dh, w, dst, IFaceBar::IFACE_BAR_WIDTH);
// copy the tail of 460 pixels wide
long sxOffset = w - 460; // offset where to get the tail
long dxOffset = IFaceBar::IFACE_BAR_WIDTH - 460; // offset where to insert the tail
fo::func::buf_to_buf(scr + sxOffset, 460, dh, w, dst + dxOffset, IFaceBar::IFACE_BAR_WIDTH);
// set source and destination rectangle widths
long dw = dxOffset - 29;
long sw = sxOffset - 30;
// scale the rest of the display area rectangle
fo::func::cscale(scr + 30, sw, h, w, dst + 30, dw, dh, IFaceBar::IFACE_BAR_WIDTH); // TODO: replace the scaling algorithm with a better one
}
static long __cdecl InterfaceArt(BYTE* scr, long w, long h, long srcWidth, BYTE* dst, long dstWidth) {
if (HRP::ScreenWidth() >= IFaceBar::IFACE_BAR_WIDTH) {
xOffset = IFaceBar::IFACE_BAR_WIDTH - 640;
xyOffsetAP = 15 * xOffset;
char file[33];
std::sprintf(file, "HR_IFACE_%i%s.frm", IFaceBar::IFACE_BAR_WIDTH, ((IFaceBar::UseExpandAPBar) ? "E" : ""));
auto* frm = fo::util::LoadUnlistedFrm(file, fo::ArtType::OBJ_TYPE_INTRFACE);
if (frm && frm->frames->width == IFaceBar::IFACE_BAR_WIDTH) {
h = frm->frames->height;
if (h > 100) h = 100;
fo::func::buf_to_buf(frm->frames->indexBuff, frm->frames->width, h, frm->frames->width, dst, IFaceBar::IFACE_BAR_WIDTH);
delete frm;
return 0;
}
// no required file, use the default one provided by HRP
if (!frm) frm = fo::util::LoadUnlistedFrm(((IFaceBar::UseExpandAPBar) ? "HR_IFACE_800E.frm" : "HR_IFACE_800.frm"), fo::ArtType::OBJ_TYPE_INTRFACE);
if (frm) {
// scale the 800px wide interface to the width of IFACE_BAR_WIDTH
InterfaceArtScale(frm->frames->indexBuff, frm->frames->width, frm->frames->height, dst, h);
delete frm;
} else {
// scale the vanilla interface to 640px wide (640-460=180)
InterfaceArtScale(scr, w, h, dst, h);
}
return 0;
}
return -1;
}
static void __declspec(naked) intface_init_hook_buf_to_buf() {
__asm {
pop ebx;
call InterfaceArt;
test eax, eax;
jnz default;
jmp ebx;
default:
push ebx;
jmp fo::funcoffs::buf_to_buf_;
}
}
static void __declspec(naked) intface_init_hook_buf_to_buf_1() {
__asm {
mov eax, IFaceBar::IFACE_BAR_WIDTH;
mov [esp + 0xC + 4], eax; // from width
mov eax, xyOffsetAP;
add [esp + 4], eax; // from += 15 * (IFaceBar::IFACE_BAR_WIDTH - 640)
jmp fo::funcoffs::buf_to_buf_;
}
}
static void __declspec(naked) intface_update_move_points_hook_buf_to_buf() {
__asm {
mov eax, IFaceBar::IFACE_BAR_WIDTH;
mov [esp + 0x14 + 4], eax; // to width
mov eax, xyOffsetAP;
add [esp + 0x10 + 4], eax; // to += 15 * (IFaceBar::IFACE_BAR_WIDTH - 640)
jmp fo::funcoffs::buf_to_buf_;
}
}
static void __declspec(naked) intface_init_hack_at_win_register_button() {
__asm {
add edx, xOffset;
jmp fo::funcoffs::win_register_button_;
}
}
//////////////////// Message Display Hacks ////////////////////
static void __declspec(naked) display_init_hack() {
__asm {
mov eax, IFaceBar::display_width;
imul eax, 60; // height
jmp fo::funcoffs::mem_malloc_;
}
}
static void __cdecl display_init_hook_buf_to_buf(BYTE* scr, long w, long h, long srcWidth, BYTE* dispBuff, long dstWidth) {
fo::var::setInt(FO_VAR_intface_full_wid) = IFaceBar::IFACE_BAR_WIDTH;
fo::var::disp_rect.offx = IFaceBar::IFACE_BAR_WIDTH - 451;
fo::Window* ifaceWin = fo::func::GNW_find(fo::var::interfaceWindow);
// save the interface background to the buffer (dispBuff) for redrawing
fo::func::buf_to_buf(ifaceWin->surface + 23 + (24 * IFaceBar::IFACE_BAR_WIDTH), IFaceBar::display_width, h, IFaceBar::IFACE_BAR_WIDTH, dispBuff, IFaceBar::display_width);
}
static void __declspec(naked) display_init_hook_win_register_button() {
__asm {
mov ecx, IFaceBar::display_width;
jmp fo::funcoffs::win_register_button_;
}
}
static void __declspec(naked) display_redraw_hack() {
__asm {
idiv ebx;
imul edx, 256; // was 80
retn;
}
}
void IFaceBar::init() {
if (IFACE_BAR_WIDTH < 640) {
IFACE_BAR_WIDTH = 640;
} else if (IFACE_BAR_WIDTH > 640) {
display_width = IFaceBar::IFACE_BAR_WIDTH - 473; // message display width (800-473=327)
display_string_buf = new char[100 * 256]();
HookCall(0x45D950, intface_init_hook_buf_to_buf);
HookCall(0x45E35C, intface_init_hook_buf_to_buf_1);
HookCalls(intface_update_move_points_hook_buf_to_buf, {0x45EE43, 0x45EEDF, 0x45EF2D});
HookCalls(intface_init_hack_at_win_register_button, {0x45DA0E, 0x45DAED, 0x45DC0D, 0x45DD44, 0x45DE33, 0x45DF22, 0x45E0B5, 0x45E1EF});
HookCall(0x460883, intface_init_hack_at_win_register_button); // intface_create_end_turn_button_
HookCall(0x4609E3, intface_init_hack_at_win_register_button); // intface_create_end_combat_button_
MakeCall(0x43166F, display_init_hack);
HookCall(0x431704, display_init_hook_buf_to_buf);
//HookCall(0x43173A, display_init_hook_win_register_button);
//HookCall(0x431785, display_init_hook_win_register_button);
SafeWrite32(0x43172A, display_width);
SafeWrite32(0x431770, display_width);
// display_redraw_
MakeCall(0x431B19, display_redraw_hack);
SafeWrite32(0x431AB9, display_width);
SafeWrite32(0x431AC0, display_width);
SafeWrite32(0x431B3B, display_width);
SafeWrite32(0x431B36, (DWORD)display_string_buf);
}
HookCall(0x45D8BC, intface_init_hook_win_add);
HookCall(0x4615FF, refresh_box_bar_win_hook_win_add);
HookCall(0x4AC260, skilldex_start_hook_win_add);
HookCall(0x45EA48, intface_show_hook_win_show);
HookCall(0x45E3F5, intface_win_hide); // intface_reset_
HookCall(0x45E8FB, intface_win_hide); // intface_load_
HookCall(0x45E9FD, intface_win_hide); // intface_hide_
if (IFACE_BAR_MODE > 0) {
// Set view map height to game resolution
// replace subtract 99 with add 1
SafeWrite8(0x481CDF, 1);
SafeWrite8(0x481E2E, 1);
// replace subtract 99 with add 1
SafeWrite8(0x481DC3, -1);
SafeWrite8(0x4827A9, -1);
// remove subtract 100
SafeWrite8(0x48284F, 0);
}
}
}
sfall/HRP/InterfaceBar.h
+10
View File
@@ -12,6 +12,16 @@ namespace sfall
class IFaceBar {
public:
static void init();
static long IFACE_BAR_MODE;
static long IFACE_BAR_SIDE_ART;
static long IFACE_BAR_WIDTH;
static long IFACE_BAR_SIDES_ORI;
static long display_width;
static char* display_string_buf;
static bool UseExpandAPBar;
};
}