diff --git a/BH/BH.cpp b/BH/BH.cpp index 81423dfe..942b1290 100644 --- a/BH/BH.cpp +++ b/BH/BH.cpp @@ -105,7 +105,7 @@ void BH::Initialize() SetWindowLong(D2GFX_GetHwnd(), GWL_WNDPROC, (LONG)GameWindowEvent); }); - settingsUI = new Drawing::UI("Settings", 350, 200); + settingsUI = new Drawing::UI(BH_VERSION, 350, 200); Task::InitializeThreadPool(2); diff --git a/BH/Constants.h b/BH/Constants.h index 72ff9a7b..9da54573 100644 --- a/BH/Constants.h +++ b/BH/Constants.h @@ -1,5 +1,7 @@ #pragma once +#define BH_VERSION "BH 1.8.3" + enum TextColor { Disabled=-1, White=0, diff --git a/BH/Drawing/UI/UI.h b/BH/Drawing/UI/UI.h index adbaa26a..e0a1b6ee 100644 --- a/BH/Drawing/UI/UI.h +++ b/BH/Drawing/UI/UI.h @@ -10,8 +10,8 @@ namespace Drawing { class UITab; #define TITLE_BAR_HEIGHT 15 - #define MINIMIZED_Y_POS 460 - #define MINIMIZED_X_POS 10 + #define MINIMIZED_Y_POS 585 + #define MINIMIZED_X_POS 320 class UI : public HookGroup { private: @@ -76,4 +76,4 @@ namespace Drawing { bool InTitle(unsigned int xPos, unsigned int yPos) { return xPos >= x && xPos <= x + xSize && yPos >= y && yPos <= y + TITLE_BAR_HEIGHT; }; static bool InPos(unsigned int xPos, unsigned int yPos, unsigned int x, unsigned int y, unsigned int xSize, unsigned int ySize) { return xPos >= x && xPos <= x + xSize && yPos >= y && yPos <= y + ySize; }; }; -}; \ No newline at end of file +}; diff --git a/BH/Modules/ScreenInfo/ScreenInfo.cpp b/BH/Modules/ScreenInfo/ScreenInfo.cpp index 380093f3..74aa6d7e 100644 --- a/BH/Modules/ScreenInfo/ScreenInfo.cpp +++ b/BH/Modules/ScreenInfo/ScreenInfo.cpp @@ -13,14 +13,10 @@ void ScreenInfo::OnLoad() { Toggles["Experience Meter"] = BH::config->ReadToggle("Experience Meter", "VK_NUMPAD7", false); automapInfo = BH::config->ReadArray("AutomapInfo"); - bhText = new Texthook(Perm, 795, 6, "BH v0.1.8(beta3)"); + bhText = new Texthook(OutOfGame, 795, 6, BH_VERSION " (planqi Resurgence/Slash branch)"); bhText->SetAlignment(Right); - bhText->SetFont(6); bhText->SetColor(Gold); - bhText2 = new Texthook(Perm, 2, 592, "BH v0.1.8(beta3) (SlashDiablo Branch)"); - bhText2->SetFont(6); - if (BH::cGuardLoaded) { Texthook* cGuardText = new Texthook(Perm, 790, 23, "ÿc4cGuard Loaded"); cGuardText->SetAlignment(Right); @@ -204,9 +200,6 @@ void ScreenInfo::OnDraw() { if (Toggles["Experience Meter"].state) { drawExperienceInfo(); } - - bhText->SetBaseX(*p_D2CLIENT_ScreenSizeX - 5); - bhText2->SetBaseY(*p_D2CLIENT_ScreenSizeY - 8); } void ScreenInfo::drawExperienceInfo(){ @@ -373,9 +366,6 @@ void ScreenInfo::OnGameExit() { DiabloBlocked = false; BaalBlocked = false; ReceivedQuestPacket = false; - - bhText->SetBaseX(795); - bhText2->SetBaseY(592); }