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 some problems with the main menu in sfall HRP

Browse Source 
Minor edits to other code.
This commit is contained in:
NovaRain
2022-02-20 08:05:27 +08:00
parent 4b6bc75814
commit 15c512ff7b
13 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine/EngineUtils.cpp
+4
View File
@@ -78,6 +78,10 @@ char* GetMsg(fo::MessageList* msgList, int msgNum, int msgType) {
return nullptr;
}
fo::Window* GetWindow(long winID) {
return fo::var::window[fo::var::window_index[winID]];
}
fo::Queue* QueueFind(fo::GameObject* object, long type) {
if (fo::var::queue) {
fo::Queue* queue = fo::var::queue;
sfall/FalloutEngine/EngineUtils.h
+2
View File
@@ -54,6 +54,8 @@ fo::MessageNode* GetMsgNode(fo::MessageList* msgList, int msgNum);
char* GetMsg(fo::MessageList* msgList, int msgNum, int msgType);
fo::Window* GetWindow(long winID);
fo::Queue* QueueFind(fo::GameObject* object, long type);
// returns weapon animation code
sfall/FalloutEngine/VariableOffsets.h
+1
View File
@@ -61,6 +61,7 @@
#define FO_VAR_curr_font_num 0x51E3B0
#define FO_VAR_curr_pc_stat 0x6681AC
#define FO_VAR_curr_stack 0x59E96C
#define FO_VAR_current_palette 0x6639D0
#define FO_VAR_currentProgram 0x59E78C
#define FO_VAR_currentWindow 0x51DCB8
#define FO_VAR_cursor_line 0x664514
sfall/FalloutEngine/Variables_def.h
+2 -1
View File
@@ -21,7 +21,7 @@ VAR_(btncnt, DWORD)
VARD(cap, fo::AIcap) // dynamic array
VAR_(carCurrentArea, DWORD)
VAR_(carGasAmount, long) // from 0 to 80000
VARA(cmap, fo::PALETTE, 256)
VARA(cmap, fo::PALETTE, 256) // palette without gamma
VAR_(colorTable, DWORD)
VAR_(combat_end_due_to_load, DWORD)
VAR_(combat_free_move, DWORD)
@@ -41,6 +41,7 @@ VAR_(curr_anim_counter, DWORD)
VAR_(curr_font_num, DWORD)
VARA(curr_pc_stat, long, fo::PCSTAT_max_pc_stat)
VAR_(curr_stack, DWORD)
VARA(current_palette, fo::PALETTE, 256) // current palette without gamma
VAR_(currentProgram, fo::Program*)
VAR_(cursor_line, DWORD)
VAR_(DarkGreenColor, BYTE)
sfall/HRP/DeathScreen.cpp
+3 -2
View File
@@ -51,9 +51,9 @@ static void __cdecl main_death_scene_hook_buf_to_buf(fo::FrmData* frm, long w, l
}
}
yPosition = h;
Image::Scale(frm->frame.data, width, height, dst, w, h, Setting::ScreenWidth());
return;
}
} else {
yPosition = height;
long y = (h - height) / 2;
@@ -64,6 +64,7 @@ static void __cdecl main_death_scene_hook_buf_to_buf(fo::FrmData* frm, long w, l
}
fo::func::buf_to_buf(frm->frame.data, width, height, width, dst, Setting::ScreenWidth());
}
}
// Darkens a rectangle area for printing text
static BYTE* __fastcall DarkRectangle(long totalLines, long w) { // w:564
sfall/HRP/HelpScreen.cpp
+3 -3
View File
@@ -43,16 +43,16 @@ static void __cdecl game_help_hook_buf_to_buf(fo::FrmData* frm, long w, long h,
Image::GetAspectSize(width, height, &x, &y, w, h);
if (x || y) dst += x + (y * Setting::ScreenWidth());
}
Image::Scale(frm->frame.data, width, height, dst, w, h, Setting::ScreenWidth());
return;
}
Image::Scale(frm->frame.data, width, height, dst, w, h, Setting::ScreenWidth());
} else {
long y = (h - height) / 2;
long x = (w - width) / 2;
if (x || y) dst += x + (y * Setting::ScreenWidth());
fo::func::buf_to_buf(frm->frame.data, width, height, width, dst, Setting::ScreenWidth());
}
}
void HelpScreen::init() {
sf::HookCall(0x443FB2, game_help_hook_win_add);
sfall/HRP/Image.cpp
+7 -7
View File
@@ -163,8 +163,8 @@ struct BMPHEADER {
};
#pragma pack(pop)
/* BMP 24-bit
bool MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pitch) {
// BMP 24-bit
bool Image::MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pitch) {
long bmpExtraSize = width * 3 % 4;
if (bmpExtraSize != 0) bmpExtraSize = 4 - bmpExtraSize;
@@ -174,7 +174,7 @@ bool MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pi
BMPHEADER bmpHeader;
std::memset(&bmpHeader, 0, sizeof(BMPHEADER));
bmpHeader.bFile.bfType = 'BM';
bmpHeader.bFile.bfType = 'MB';
bmpHeader.bFile.bfSize = sizeImage + sizeof(BMPHEADER);
bmpHeader.bFile.bfOffBits = sizeof(BMPHEADER);
bmpHeader.bInfo.biSize = sizeof(BITMAPINFOHEADER);
@@ -189,9 +189,9 @@ bool MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pi
BYTE* dData = bmpImageData;
// 32-bit to 24-bit
for (size_t h = 0; h < height; h++) {
for (long h = 0; h < height; h++) {
BYTE* sData = dataRGB32;
for (size_t w = 0; w < width; w++) {
for (long w = 0; w < width; w++) {
*dData++ = *sData++;
*dData++ = *sData++;
*dData++ = *sData++;
@@ -201,7 +201,7 @@ bool MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pi
dData += bmpExtraSize;
}
HANDLE hFile = CreateFileA(file, GENERIC_WRITE, 0, 0, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
HANDLE hFile = CreateFileA(file, GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
bool result = (hFile != INVALID_HANDLE_VALUE);
if (result) {
@@ -213,6 +213,6 @@ bool MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pi
delete[] bmpImageData;
return result;
}*/
}
}
sfall/HRP/Image.h
+2
View File
@@ -17,6 +17,8 @@ public:
static void Scale(BYTE* src, long sWight, long sHeight, BYTE* dst, long dWight, long dHeight, long dPitch = 0, long sPitch = 0);
static void ScaleText(BYTE* dst, const char* text, long txtWidth, long dstWidth, long colorFlags, float scaleFactor);
static bool MakeBMP(const char* file, BYTE* dataRGB32, long width, long height, long pitch);
};
}
sfall/HRP/Init.cpp
+4 -3
View File
@@ -90,11 +90,12 @@ bool Setting::ExternalEnabled() {
static std::string GetBackupFileName(const char* runFileName, bool wait) {
std::string bakExeName(runFileName);
size_t n = bakExeName.rfind('.');
if (n != std::string::npos) {
if (n == std::string::npos) return std::string(); // empty
bakExeName.replace(n, 4, ".hrp");
char c = 10;
while (std::remove(bakExeName.c_str()) != 0 && wait && --c) Sleep(1000); // delete .hrp (if it exists)
}
return bakExeName;
}
@@ -121,7 +122,7 @@ static bool DisableExtHRP(const char* runFileName, std::string &cmdline) {
std::fclose(ft);
cmdline.append(" -restart");
MessageBoxA(0, "High Resolution Patch has been successfully deactivated.", "sfall", MB_TASKMODAL | MB_ICONINFORMATION);
//MessageBoxA(0, "High Resolution Patch has been successfully deactivated.", "sfall", MB_TASKMODAL | MB_ICONINFORMATION);
ShellExecuteA(0, 0, runFileName, cmdline.c_str(), 0, SW_SHOWDEFAULT); // restart game
return true;
sfall/HRP/MainMenu.cpp
+14 -9
View File
@@ -43,7 +43,7 @@ static long offsetX = 0, offsetY = 0;
// draw image to main menu window
static void __cdecl main_menu_create_hook_buf_to_buf(BYTE* src, long sw, long sh, long srcW, BYTE* dst, long dstW) {
fo::Window* win = fo::var::window[fo::var::main_window]; // the window size is always equal to the scaled image
fo::Window* win = fo::util::GetWindow(fo::var::main_window); // the window size is always equal to the scaled image
long h = win->height;
long w = win->width;
dstW = w;
@@ -113,18 +113,17 @@ static long __fastcall main_menu_create_hook_add_win(long h, long y, long color,
}
}
if (MainMenuScreen::MAIN_MENU_SIZE == 1 || sw > Setting::ScreenWidth() || sh > Setting::ScreenHeight()) {
if (MainMenuScreen::MAIN_MENU_SIZE || sw > Setting::ScreenWidth() || sh > Setting::ScreenHeight()) {
// out size
w = Setting::ScreenWidth();
h = Setting::ScreenHeight();
if (MainMenuScreen::MAIN_MENU_SIZE <= 1) {
Image::GetAspectSize(sw, sh, &x, &y, w, h);
if (w > Setting::ScreenWidth()) w = Setting::ScreenWidth();
if (h > Setting::ScreenHeight()) h = Setting::ScreenHeight();
} else if (MainMenuScreen::MAIN_MENU_SIZE == 2) {
h = Setting::ScreenHeight();
w = Setting::ScreenWidth();
}
} else {
// centering
x = (Setting::ScreenWidth() - w) / 2;
@@ -140,8 +139,14 @@ static long __fastcall main_menu_create_hook_add_win(long h, long y, long color,
if (MainMenuScreen::USE_HIRES_IMAGES == false || (MainMenuScreen::USE_HIRES_IMAGES && MainMenuScreen::SCALE_BUTTONS_AND_TEXT_MENU)) {
scaleFactor = scaleHeight;
} else {
if (w != 640) offsetX = (long)(6.0f * (Setting::ScreenWidth() * 0.0015625));
if (h != 480) offsetY = (long)(4.0f * (Setting::ScreenHeight() * 0.0020833334f));
if (w != 640) {
float diff = (Setting::ScreenWidth() / 640.0f);
offsetX = (long)((8.0f * (diff * diff)));
}
if (h != 480) {
float diff = (Setting::ScreenHeight() / 480.0f);
offsetY = (long)((6.0f * (diff * diff)));
}
}
sf::MainMenu::mTextOffset = offsetX;
@@ -158,7 +163,7 @@ static long __fastcall main_menu_create_hook_add_win(long h, long y, long color,
}
static long __fastcall GetHeightOffset(long &y) {
long h = fo::var::window[fo::var::main_window]->height;
long h = fo::util::GetWindow(fo::var::main_window)->height;
y = ((y - 460) - 20) + h;
if (y > h) {
y = h - 10;
@@ -237,7 +242,7 @@ static long __fastcall ButtonPosition(long &width, long xPos, BYTE* &upImageData
xPos = (long)(xPos * scaleFactor);
}
long h = fo::var::window[fo::var::main_window]->height;
long h = fo::util::GetWindow(fo::var::main_window)->height;
/*** Button position ***/
xPos += (long)(sf::MainMenu::mXOffset * scaleWidth) + offsetX;
sfall/HRP/MoviesScreen.cpp
+7 -7
View File
@@ -30,7 +30,13 @@ static void __fastcall SetMovieSize() {
long subtitleHeight = (fo::var::getInt(FO_VAR_subtitles) && fo::var::getInt(FO_VAR_subtitleList)) ? fo::var::getInt(FO_VAR_subtitleH) + 4 : 0;
if (MoviesScreen::MOVIE_SIZE == 1 || bW > sWidth || bH > sHeight) {
if (MoviesScreen::MOVIE_SIZE == 2) {
movieToSize.top = 0;
movieToSize.bottom = Setting::ScreenHeight() - subtitleHeight;
movieToSize.left = 0;
movieToSize.right = Setting::ScreenWidth();
} else if (MoviesScreen::MOVIE_SIZE == 1 || bW > sWidth || bH > sHeight) {
long aspectW = sWidth;
long aspectH = sHeight;
long x = 0;
@@ -41,12 +47,6 @@ static void __fastcall SetMovieSize() {
movieToSize.top = y;
movieToSize.right = x + aspectW;
movieToSize.bottom = y + aspectH;
} else if (MoviesScreen::MOVIE_SIZE == 2) {
movieToSize.top = 0;
movieToSize.bottom = Setting::ScreenHeight() - subtitleHeight;
movieToSize.left = 0;
movieToSize.right = Setting::ScreenWidth();
} else {
// set to center
movieToSize.top = (Setting::ScreenHeight() - bH) / 2;
sfall/HRP/SlidesScreen.cpp
+1
View File
@@ -60,6 +60,7 @@ static void __cdecl endgame_display_image_hook_buf_to_buf(BYTE* src, long w, lon
if (x || y) dst += x + (y * Setting::ScreenWidth());
}
bottomPos = h;
Image::Scale(src, width, height, dst, w, h, Setting::ScreenWidth());
} else {
bottomPos = height;
sfall/Modules/MainMenu.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ static void __declspec(naked) MainMenuHookTextYOffset() {
static void __fastcall main_menu_create_hook_print_text(long xPos, const char* text, long yPos, long color) {
long winId = fo::var::main_window;
if (!HRP::Setting::ExternalEnabled() && HRP::Setting::IsEnabled()) {
fo::Window* win = fo::var::window[winId];
fo::Window* win = fo::util::GetWindow(winId);
yPos = ((yPos - 460) - 20) + win->height;
xPos = ((xPos - 615) - 25) + win->width;
}