diff --git a/artifacts/scripting/headers/sfall.h b/artifacts/scripting/headers/sfall.h index 3e1654cd..09f5b9a4 100644 --- a/artifacts/scripting/headers/sfall.h +++ b/artifacts/scripting/headers/sfall.h @@ -324,6 +324,9 @@ #define obj_under_cursor(onlyCritter, includeDude) sfall_func2("obj_under_cursor", onlyCritter, includeDude) #define objects_in_radius(tile, radius, elev, type) sfall_func4("objects_in_radius", tile, radius, elev, type) #define outlined_object sfall_func0("outlined_object") +#define overlay_create(winType) sfall_func2("interface_overlay", winType, 1) +#define overlay_clear(winType) sfall_func2("interface_overlay", winType, 2) +#define overlay_clear_rectangle(winType, x, y, w, h) sfall_func6("interface_overlay", winType, 2, x, y, w, h) #define real_dude_obj sfall_func0("real_dude_obj") #define remove_all_timer_events sfall_func0("remove_timer_event") #define remove_timer_event(fixedParam) sfall_func1("remove_timer_event", fixedParam) diff --git a/sfall/FalloutStructs.h b/sfall/FalloutStructs.h index b59684e7..019e827a 100644 --- a/sfall/FalloutStructs.h +++ b/sfall/FalloutStructs.h @@ -487,28 +487,28 @@ struct ScriptListInfoItem { //for holding window info struct WINinfo { - long wID; + long wID; // window position in the _window_index array long flags; union { RECT wRect; BoundRect rect; }; - long width; - long height; - long clearColour; - long randX; - long randY; - BYTE *surface; // bytes frame data ref to palette - long *buttonsList; - long buttonT1; // buttonptr? - long buttonT2; - long *menuBar; - void (__cdecl *drawFunc)(BYTE* src, long width, long height, long src_width, BYTE* dst, long dst_width); // trans_buf_to_buf_ + long width; + long height; + long clearColour; + long randX; // not used by engine + long* randY; // used by sfall for additional surfaces + BYTE* surface; // bytes frame data ref to palette + long* buttonsList; + long buttonT1; // buttonptr? + long buttonT2; + long* menuBar; + void (__cdecl *drawFunc)(BYTE* src, long width, long height, long src_width, BYTE* dst, long dst_width); // trans_buf_to_buf_ }; struct sWindow { char name[32]; - long wID; + long wID; // window position in the _window_index array long width; long height; long region1; diff --git a/sfall/Graphics.cpp b/sfall/Graphics.cpp index 0f420a01..71a42697 100644 --- a/sfall/Graphics.cpp +++ b/sfall/Graphics.cpp @@ -1294,39 +1294,162 @@ static __declspec(naked) void game_init_hook() { } } -static double fadeMulti; - -static __declspec(naked) void palette_fade_to_hook() { - __asm { - push ebx; // _fade_steps - fild [esp]; - fmul fadeMulti; - fistp [esp]; - pop ebx; - jmp fadeSystemPalette_; - } -} - -//////////////////////////////////////////////////////////////////////////////// +///////////////////////////////// GAME RENDER ////////////////////////////////// static __forceinline void UpdateDDSurface(BYTE* surface, int width, int height, int widthFrom, RECT* rect) { + long x = rect->left; + long y = rect->top; + if (GraphicsMode == 0) { + __asm { + xor eax, eax; + push y; + push x; + push height; + push width; + push eax; // yFrom + push eax; // xFrom + push eax; // heightFrom + push widthFrom; + push surface; + call ds:[_scr_blit]; // GNW95_ShowRect_(int from, int widthFrom, int heightFrom, int xFrom, int yFrom, int width, int height, int x, int y) + add esp, 9*4; + } + return; + } if (!DeviceLost) { DDSURFACEDESC desc; - RECT lockRect = { rect->left, rect->top, rect->right + 1, rect->bottom + 1 }; + RECT lockRect = { x, y, rect->right + 1, rect->bottom + 1 }; primaryDDSurface->Lock(&lockRect, &desc, 0, 0); - if (GPUBlt == 0) desc.lpSurface = (BYTE*)desc.lpSurface + (desc.lPitch * rect->top) + rect->left; + if (GPUBlt == 0) desc.lpSurface = (BYTE*)desc.lpSurface + (desc.lPitch * y) + x; BufToBuf(surface, width, height, widthFrom, (BYTE*)desc.lpSurface, desc.lPitch); primaryDDSurface->Unlock(desc.lpSurface); } } +class OverlaySurface +{ +private: + long size; + long surfWidth; + long allocSize; + BYTE* surface; + +public: + //long winType = -1; + + OverlaySurface() : size(0), surface(nullptr) {} + + BYTE* Surface() { return surface; } + + void CreateSurface(WINinfo* win, long winType) { + //this->winType = winType; + this->surfWidth = win->width; + this->size = win->height * win->width; + + if (surface != nullptr) { + if (size <= allocSize) { + std::memset(surface, 0, size); + return; + } + delete[] surface; + } + + this->allocSize = size; + surface = new BYTE[size](); + } + + void ClearSurface() { + if (surface != nullptr) std::memset(surface, 0, size); + } + + void ClearSurface(sRectangle &rect) { + if (surface != nullptr) { + if (rect.width > surfWidth || rect.height > (size / surfWidth)) return; // going beyond the surface size + BYTE* surf = surface + (surfWidth * rect.y) + rect.x; + + size_t sizeD = rect.width >> 2; + size_t sizeB = rect.width & 3; + size_t stride = sizeD << 2; + + long height = rect.height; + while (height--) { + if (sizeD) { + __stosd((DWORD*)surf, 0, sizeD); + surf += stride; + } + if (sizeB) { + __stosb(surf, 0, sizeB); + surf += sizeB; + } + }; + } + } + + /*void DestroySurface() { + delete[] surface; + surface = nullptr; + }*/ + + ~OverlaySurface() { + delete[] surface; + } +} overlaySurfaces[5]; + +static long indexPosition = 0; + +void GameRender_CreateOverlaySurface(WINinfo* win, long winType) { + overlaySurfaces[indexPosition].CreateSurface(win, winType); + win->randY = reinterpret_cast(&overlaySurfaces[indexPosition]); + if (++indexPosition == 5) indexPosition = 0; +}; + +BYTE* GameRender_GetOverlaySurface(WINinfo* win) { + return reinterpret_cast(win->randY)->Surface(); +}; + +void GameRender_ClearOverlay(WINinfo* win) { + if (win->randY) reinterpret_cast(win->randY)->ClearSurface(); +}; + +void GameRender_ClearOverlay(WINinfo* win, sRectangle &rect) { + if (win->randY) reinterpret_cast(win->randY)->ClearSurface(rect); +}; + +/*void GameRender_DestroyOverlaySurface(long winType) { + for (size_t i = 0; i < 5; i++) { + if (overlaySurfaces[i].winType == winType) { + overlaySurfaces[i].DestroySurface(); + overlaySurfaces[i].winType = -1; + //break; + } + } +};*/ + static BYTE* GetBuffer() { return (BYTE*)*(DWORD*)_screen_buffer; } +static void Draw(WINinfo* win, BYTE* surface, long width, long height, long widthFrom, BYTE* toBuffer, long toWidth, RECT &rect, RECT* updateRect) { + auto drawFunc = (win->flags & WinFlags::Transparent && win->wID) ? TransBufToBuf : BufToBuf; + if (toBuffer) { + drawFunc(surface, width, height, widthFrom, &toBuffer[rect.left - updateRect->left] + ((rect.top - updateRect->top) * toWidth), toWidth); + } else { + drawFunc(surface, width, height, widthFrom, &GetBuffer()[rect.left] + (rect.top * toWidth), toWidth); // copy to buffer instead of DD surface (buffering) + } + + if (!win->randY) return; + surface = &GameRender_GetOverlaySurface(win)[rect.left - win->rect.x] + ((rect.top - win->rect.y) * win->width); + + if (toBuffer) { + TransBufToBuf(surface, width, height, widthFrom, &toBuffer[rect.left - updateRect->left] + ((rect.top - updateRect->top) * toWidth), toWidth); + } else { + TransBufToBuf(surface, width, height, widthFrom, &GetBuffer()[rect.left] + (rect.top * toWidth), toWidth); + } +} + static void __fastcall sf_GNW_win_refresh(WINinfo* win, RECT* updateRect, BYTE* toBuffer) { if (win->flags & WinFlags::Hidden) return; RectList* rects; @@ -1372,9 +1495,9 @@ static void __fastcall sf_GNW_win_refresh(WINinfo* win, RECT* updateRect, BYTE* UpdateDDSurface(&GetBuffer()[rects->wRect.left - updateRect->left] + (rects->wRect.top - updateRect->top) * w, wRect, hRect, w, &rects->wRect); - RectList* next = rects->nextRect; - sf_rect_free(rects); - rects = next; + RectList* free = rects; + rects = rects->nextRect; + sf_rect_free(free); } } return; @@ -1390,18 +1513,17 @@ static void __fastcall sf_GNW_win_refresh(WINinfo* win, RECT* updateRect, BYTE* rects->rect.offx = updateRect->right; rects->rect.offy = updateRect->bottom; rects->nextRect = nullptr; - RECT &rect = rects->wRect; /* If the border of the updateRect rectangle is located outside the window, then assign to rects->rect the border of the window rectangle Otherwise, rects->rect contains the borders from the update rectangle (updateRect) */ - if (win->wRect.left >= rect.left) rect.left = win->wRect.left; - if (win->wRect.top >= rect.top) rect.top = win->wRect.top; - if (win->wRect.right <= rect.right) rect.right = win->wRect.right; - if (win->wRect.bottom <= rect.bottom) rect.bottom = win->wRect.bottom; + if (rects->wRect.left < win->wRect.left) rects->wRect.left = win->wRect.left; + if (rects->wRect.top < win->wRect.top) rects->wRect.top = win->wRect.top; + if (rects->wRect.right > win->wRect.right) rects->wRect.right = win->wRect.right; + if (rects->wRect.bottom > win->wRect.bottom) rects->wRect.bottom = win->wRect.bottom; - if (rect.right < rect.left || rect.bottom < rect.top) { + if (rects->wRect.right < rects->wRect.left || rects->wRect.bottom < rects->wRect.top) { sf_rect_free(rects); return; } @@ -1413,9 +1535,8 @@ static void __fastcall sf_GNW_win_refresh(WINinfo* win, RECT* updateRect, BYTE* RectList* currRect = rects; while (currRect) { - RECT &crect = currRect->wRect; - int width = (crect.right - crect.left) + 1; // for current rectangle - int height = (crect.bottom - crect.top) + 1;; // for current rectangle + int width = (currRect->wRect.right - currRect->wRect.left) + 1; // for current rectangle + int height = (currRect->wRect.bottom - currRect->wRect.top) + 1;; // for current rectangle BYTE* surface; if (win->wID > 0) { @@ -1424,20 +1545,14 @@ static void __fastcall sf_GNW_win_refresh(WINinfo* win, RECT* updateRect, BYTE* mov edx, currRect; call GNW_button_refresh_; } - surface = &win->surface[crect.left - win->rect.x] + ((crect.top - win->rect.y) * win->width); + surface = &win->surface[currRect->wRect.left - win->rect.x] + ((currRect->wRect.top - win->rect.y) * win->width); } else { surface = new BYTE[height * width](); // black background widthFrom = width; // replace with rectangle } - auto drawFunc = (win->flags & WinFlags::Transparent && win->wID) ? TransBufToBuf : BufToBuf; - if (toBuffer) { - drawFunc(surface, width, height, widthFrom, &toBuffer[crect.left - updateRect->left] + ((crect.top - updateRect->top) * toWidth), toWidth); - } else { - // copy to buffer instead of DD surface (buffering) - drawFunc(surface, width, height, widthFrom, &GetBuffer()[crect.left] + (crect.top * toWidth), toWidth); - //UpdateDDSurface(surface, width, height, widthFrom, crect); - } + Draw(win, surface, width, height, widthFrom, toBuffer, toWidth, currRect->wRect, updateRect); + if (win->wID == 0) delete[] surface; currRect = currRect->nextRect; @@ -1449,6 +1564,7 @@ static void __fastcall sf_GNW_win_refresh(WINinfo* win, RECT* updateRect, BYTE* int width = (rects->rect.offx - rects->rect.x) + 1; int height = (rects->rect.offy - rects->rect.y) + 1; int widthFrom = toWidth; + UpdateDDSurface(&GetBuffer()[rects->rect.x] + (rects->rect.y * widthFrom), width, height, widthFrom, &rects->wRect); } RectList* next = rects->nextRect; @@ -1471,6 +1587,21 @@ static __declspec(naked) void GNW_win_refresh_hack() { } } +//////////////////////////////////////////////////////////////////////////////// + +static double fadeMulti; + +static __declspec(naked) void palette_fade_to_hook() { + __asm { + push ebx; // _fade_steps + fild [esp]; + fmul fadeMulti; + fistp [esp]; + pop ebx; + jmp fadeSystemPalette_; + } +} + void Graphics_OnGameLoad() { // ResetShaders for (DWORD d = 0; d < shadersSize; d++) SAFERELEASE(shaders[d].Effect); shaders.clear(); @@ -1528,17 +1659,23 @@ void Graphics_Init() { MakeJump(0x4D3704, TransBufToBuf); // trans_buf_to_buf_ // Enable support for transparent interface windows - SafeWrite16(0x4D5D46, 0x9090); // win_init_ (create screen_buffer) + const DWORD winBufferAddr [] = { + 0x4D5D46, // win_init_ (create screen_buffer) + 0x4D75E6 // win_clip_ (remove _buffering checking) + }; + SafeWriteBatch(0x9090, winBufferAddr); SafeWrite8(0x42F869, WinFlags::MoveOnTop | WinFlags::OwnerFlag); // addWindow_ (remove Transparent flag) - if (GraphicsMode) { - // custom implementation of the GNW_win_refresh function - MakeJump(0x4D6FD9, GNW_win_refresh_hack, 1); - SafeWrite16(0x4D75E6, 0x9090); // win_clip_ (remove _buffering checking) - SafeWrite32(0x4C8FD1, _screen_buffer); // replace screendump_buf - } else { // for default or HRP graphics mode - SafeWrite8(0x4D5DAB, 0x1D); // ecx > ebx (enable _buffering) - BlockCall(0x431076); // dialogMessage_ - } + + // Custom implementation of the GNW_win_refresh function + MakeJump(0x4D6FD9, GNW_win_refresh_hack, 1); + // Replace _screendump_buf with _screen_buffer for creating screenshots + const DWORD scrdumpBufAddr[] = {0x4C8FD1, 0x4C900D}; + SafeWriteBatch(_screen_buffer, scrdumpBufAddr); + + // Disable unused code for the RandX and RandY window structure fields (these fields can now be used for other purposes) + SafeWrite32(0x4D630C, 0x9090C031); // xor eax, eax + SafeWrite8(0x4D6310, 0x90); + BlockCall(0x4D6319); } void Graphics_Exit() { diff --git a/sfall/Graphics.h b/sfall/Graphics.h index 2b170399..446b27b5 100644 --- a/sfall/Graphics.h +++ b/sfall/Graphics.h @@ -51,6 +51,12 @@ void Gfx_ReleaseMovieTexture(); void Gfx_RefreshGraphics(); +void GameRender_CreateOverlaySurface(WINinfo* win, long winType); +//void GameRender_DestroyOverlaySurface(long winType); +void GameRender_ClearOverlay(WINinfo* win); +void GameRender_ClearOverlay(WINinfo* win, sRectangle &rect); +BYTE* GameRender_GetOverlaySurface(WINinfo* win); + int __stdcall GetShaderVersion(); int __stdcall LoadShader(const char*); void __stdcall ActivateShader(DWORD); diff --git a/sfall/ScriptExtender.cpp b/sfall/ScriptExtender.cpp index 899ce804..79f3930b 100644 --- a/sfall/ScriptExtender.cpp +++ b/sfall/ScriptExtender.cpp @@ -862,6 +862,7 @@ static const SfallOpcodeMetadata opcodeMetaArray[] = { {mf_get_window_attribute, "get_window_attribute", {DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, {mf_hide_window, "hide_window", {DATATYPE_MASK_STR}}, {mf_interface_art_draw, "interface_art_draw", {DATATYPE_MASK_INT, DATATYPE_MASK_INT | DATATYPE_MASK_STR, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, + {mf_interface_overlay, "interface_overlay", {DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, {mf_interface_print, "interface_print", {DATATYPE_MASK_STR, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, {mf_inventory_redraw, "inventory_redraw", {DATATYPE_MASK_INT}}, {mf_message_box, "message_box", {DATATYPE_MASK_STR, DATATYPE_MASK_INT, DATATYPE_MASK_INT, DATATYPE_MASK_INT}}, diff --git a/sfall/ScriptOps/InterfaceOps.hpp b/sfall/ScriptOps/InterfaceOps.hpp index ee2b9156..d1b4c9e3 100644 --- a/sfall/ScriptOps/InterfaceOps.hpp +++ b/sfall/ScriptOps/InterfaceOps.hpp @@ -20,6 +20,7 @@ #include "main.h" +#include "Graphics.h" #include "InputFuncs.h" #include "Interface.h" #include "LoadGameHook.h" @@ -648,7 +649,7 @@ static void mf_draw_image_scaled() { opHandler.setReturn(DrawImage(opHandler, true, "draw_image_scaled")); } -static long __stdcall InterfaceDrawImage(OpcodeHandler& opHandler, WINinfo* interfaceWin, const char* metaruleName) { +static long __stdcall InterfaceDrawImage(OpcodeHandler& opHandler, WINinfo* ifaceWin, const char* metaruleName) { const char* file = nullptr; bool useShift = false; long direction = -1, w = -1, h = -1; @@ -694,12 +695,14 @@ static long __stdcall InterfaceDrawImage(OpcodeHandler& opHandler, WINinfo* inte int width = (w >= 0) ? w : framePtr->width; int height = (h >= 0) ? h : framePtr->height; + BYTE* surface = (ifaceWin->randY) ? GameRender_GetOverlaySurface(ifaceWin) : ifaceWin->surface; + TransCscale(((frmPtr->id == 'PCX') ? frmPtr->pixelData : framePtr->data), framePtr->width, framePtr->height, framePtr->width, - interfaceWin->surface + (y * interfaceWin->width) + x, width, height, interfaceWin->width + surface + (y * ifaceWin->width) + x, width, height, ifaceWin->width ); if (!(opHandler.arg(0).rawValue() & 0x1000000)) { - GNWWinRefresh(interfaceWin, &interfaceWin->rect, 0); + GNWWinRefresh(ifaceWin, &ifaceWin->rect, 0); } FreeArtFile(frmPtr); @@ -851,12 +854,21 @@ static void mf_interface_print() { // same as vanilla PrintRect __asm call windowGetTextColor_; // set from SetTextColor __asm mov byte ptr color, al; } + + BYTE* surface; + if (win->randY) { // if a surface was created, the engine will draw on it + surface = win->surface; + win->surface = GameRender_GetOverlaySurface(win); // replace the surface for the windowWrapLineWithSpacing_ function + } + if (color & 0x10000) { // shadow (textshadow) WindowWrapLineWithSpacing(win->wID, text, width, maxHeight, x, y, 0x201000F, 0, 0); color ^= 0x10000; } opHandler.setReturn(WindowWrapLineWithSpacing(win->wID, text, width, maxHeight, x, y, color, 0, 0)); // returns count of lines printed + if (win->randY) win->surface = surface; + // no redraw (textdirect) if (!(color & 0x1000000)) GNWWinRefresh(win, &win->rect, 0); } @@ -879,3 +891,37 @@ static void mf_win_fill_color() { ClearWindow(ptr_sWindows[iWin].wID, false); // full clear } } + +static void mf_interface_overlay() { + WINinfo* win = nullptr; + long winType = opHandler.arg(0).rawValue(); + + if (opHandler.arg(1).rawValue()) { + win = Interface_GetWindow(winType); + if (!win || (int)win == -1) return; + } + + switch (opHandler.arg(1).rawValue()) { + case 1: + GameRender_CreateOverlaySurface(win, winType); + break; + case 2: // clear + if (opHandler.numArgs() > 2) { + long w = opHandler.arg(4).rawValue(); + long h = opHandler.arg(5).rawValue(); + if (w <= 0 || h <= 0) return; + + long x = opHandler.arg(2).rawValue(); + long y = opHandler.arg(3).rawValue(); + if (x < 0 || y < 0) return; + + sRectangle rect = { x, y, w, h }; + GameRender_ClearOverlay(win, rect); + } else { + GameRender_ClearOverlay(win); + } + break; + //case 0: // unused (reserved) + // GameRender_DestroyOverlaySurface(winType); + } +} diff --git a/sfall/ScriptOps/MetaruleOps.hpp b/sfall/ScriptOps/MetaruleOps.hpp index f11bb601..31767cfa 100644 --- a/sfall/ScriptOps/MetaruleOps.hpp +++ b/sfall/ScriptOps/MetaruleOps.hpp @@ -148,6 +148,7 @@ static const SfallMetarule metaruleArray[] = { {"get_window_attribute", mf_get_window_attribute, 1, 2}, {"hide_window", mf_hide_window, 0, 1}, {"interface_art_draw", mf_interface_art_draw, 4, 6}, + {"interface_overlay", mf_interface_overlay, 2, 6}, {"interface_print", mf_interface_print, 5, 6}, {"intface_hide", mf_intface_hide, 0, 0}, {"intface_is_hidden", mf_intface_is_hidden, 0, 0}, diff --git a/sfall/main.h b/sfall/main.h index 3722b1ed..4cd1dffc 100644 --- a/sfall/main.h +++ b/sfall/main.h @@ -76,6 +76,13 @@ struct ddrawDll { #define pushadc __asm push eax __asm push edx __asm push ecx #define popadc __asm pop ecx __asm pop edx __asm pop eax +struct sRectangle { + long x, y, width, height; + + long right() { return x + width; } + long bottom() { return y + height; } +}; + // Gets the integer value from given INI file. int iniGetInt(const char* section, const char* setting, int defaultValue, const char* iniFile);