diff options
Diffstat (limited to 'Private/Builtins/Toolbox')
| -rw-r--r-- | Private/Builtins/Toolbox/Toolbox.hxx | 12 | ||||
| -rw-r--r-- | Private/Builtins/Toolbox/Utils.hxx | 22 |
2 files changed, 17 insertions, 17 deletions
diff --git a/Private/Builtins/Toolbox/Toolbox.hxx b/Private/Builtins/Toolbox/Toolbox.hxx index ebd8fc1e..f831acb5 100644 --- a/Private/Builtins/Toolbox/Toolbox.hxx +++ b/Private/Builtins/Toolbox/Toolbox.hxx @@ -8,11 +8,11 @@ #include <NewKit/Defines.hpp> -EXTERN_C HCore::Void _hal_init_mouse(); -EXTERN_C HCore::Boolean _hal_draw_mouse(); -EXTERN_C HCore::Void _hal_handle_mouse(); -EXTERN_C HCore::Boolean _hal_left_button_pressed(); -EXTERN_C HCore::Boolean _hal_middle_button_pressed(); -EXTERN_C HCore::Boolean _hal_right_button_pressed(); +EXTERN_C NewOS::Void _hal_init_mouse(); +EXTERN_C NewOS::Boolean _hal_draw_mouse(); +EXTERN_C NewOS::Void _hal_handle_mouse(); +EXTERN_C NewOS::Boolean _hal_left_button_pressed(); +EXTERN_C NewOS::Boolean _hal_middle_button_pressed(); +EXTERN_C NewOS::Boolean _hal_right_button_pressed(); #include <Builtins/Toolbox/Utils.hxx> diff --git a/Private/Builtins/Toolbox/Utils.hxx b/Private/Builtins/Toolbox/Utils.hxx index 7dec8608..29ca585a 100644 --- a/Private/Builtins/Toolbox/Utils.hxx +++ b/Private/Builtins/Toolbox/Utils.hxx @@ -4,7 +4,7 @@ // Last Rev // Sat Feb 24 CET 2024 -#define ToolboxInitRsrc() HCore::SizeT uA = 0 +#define ToolboxInitRsrc() NewOS::SizeT uA = 0 #define kClearClr RGB(00, 00, 00) @@ -14,17 +14,17 @@ #define ToolboxDrawRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ uA = 0; \ \ - for (HCore::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (HCore::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ + for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ if (ImgPtr[uA] == 0) { \ - *(((volatile HCore::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * \ kHandoverHeader->f_GOP \ .f_PixelPerLine * \ i + \ 4 * u))) |= ImgPtr[uA]; \ } else { \ - *(((volatile HCore::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * \ kHandoverHeader->f_GOP \ .f_PixelPerLine * \ @@ -40,9 +40,9 @@ /// @brief Cleans a resource. #define ToolboxClearZone(_Height, _Width, BaseX, BaseY) \ \ - for (HCore::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (HCore::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ - *(((volatile HCore::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + for (NewOS::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ + for (NewOS::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * \ kHandoverHeader->f_GOP \ .f_PixelPerLine * \ @@ -55,9 +55,9 @@ /// @brief Draws inside a zone. #define ToolboxDrawZone(_Clr, _Height, _Width, BaseX, BaseY) \ \ - for (HCore::SizeT i = BaseX; i < _Width + BaseX; ++i) { \ - for (HCore::SizeT u = BaseY; u < _Height + BaseY; ++u) { \ - *(((volatile HCore::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + for (NewOS::SizeT i = BaseX; i < _Width + BaseX; ++i) { \ + for (NewOS::SizeT u = BaseY; u < _Height + BaseY; ++u) { \ + *(((volatile NewOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * \ kHandoverHeader->f_GOP \ .f_PixelPerLine * \ |