Compare commits

..

2 Commits

Author SHA1 Message Date
fallenoak
7ec9a35b4b
feat(ui): implement Script_GetBonusBarOffset
Some checks are pending
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:cl compiler_name:MSVC cxx:cl os:windows-latest system_name:Windows test_path:WhoaTest]) (push) Waiting to run
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:clang compiler_name:Clang cxx:clang++ os:macos-latest system_name:macOS test_path:WhoaTest]) (push) Waiting to run
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:gcc compiler_name:GCC cxx:g++ os:ubuntu-latest system_name:Linux test_path:WhoaTest]) (push) Waiting to run
2026-02-08 07:16:58 -06:00
fallenoak
43895197af
feat(ui): implement Script_SetCVar 2026-02-08 06:58:15 -06:00
6 changed files with 55 additions and 4 deletions

View File

@ -83,7 +83,9 @@ int32_t Script_IsActionInRange(lua_State* L) {
} }
int32_t Script_GetBonusBarOffset(lua_State* L) { int32_t Script_GetBonusBarOffset(lua_State* L) {
WHOA_UNIMPLEMENTED(0); lua_pushnumber(L, CGActionBar::GetBonusBarOffset());
return 1;
} }
int32_t Script_GetMultiCastBarOffset(lua_State* L) { int32_t Script_GetMultiCastBarOffset(lua_State* L) {

View File

@ -1,4 +1,9 @@
#include "ui/game/CGActionBar.hpp" #include "ui/game/CGActionBar.hpp"
uint32_t CGActionBar::s_bonusBarOffset;
uint32_t CGActionBar::s_currentPage; uint32_t CGActionBar::s_currentPage;
uint32_t CGActionBar::s_tempPageActiveFlags; uint32_t CGActionBar::s_tempPageActiveFlags;
uint32_t CGActionBar::GetBonusBarOffset() {
return CGActionBar::s_bonusBarOffset;
}

View File

@ -5,9 +5,16 @@
class CGActionBar { class CGActionBar {
public: public:
// Static variables // Public static variables
static uint32_t s_currentPage; static uint32_t s_currentPage;
static uint32_t s_tempPageActiveFlags; static uint32_t s_tempPageActiveFlags;
// Public static functions
static uint32_t GetBonusBarOffset();
private:
// Private static variables
static uint32_t s_bonusBarOffset;
}; };
#endif #endif

View File

@ -4,6 +4,7 @@
#include "ui/FrameScript.hpp" #include "ui/FrameScript.hpp"
#include "ui/ScriptFunctionsShared.hpp" #include "ui/ScriptFunctionsShared.hpp"
#include "ui/game/CGGameUI.hpp" #include "ui/game/CGGameUI.hpp"
#include "ui/game/Types.hpp"
#include "ui/simple/CSimpleTop.hpp" #include "ui/simple/CSimpleTop.hpp"
#include "util/StringTo.hpp" #include "util/StringTo.hpp"
#include "util/Unimplemented.hpp" #include "util/Unimplemented.hpp"
@ -131,7 +132,41 @@ int32_t Script_GetCVarInfo(lua_State* L) {
} }
int32_t Script_SetCVar(lua_State* L) { int32_t Script_SetCVar(lua_State* L) {
WHOA_UNIMPLEMENTED(0); if (!lua_isstring(L, 1)) {
luaL_error(L, "Usage: SetCVar(\"cvar\", value [, \"scriptCvar\")");
return 0;
}
auto varName = lua_tostring(L, 1);
auto var = CVar::LookupRegistered(varName);
if (!var || (var->m_flags & 0x40)) {
luaL_error(L, "Couldn't find CVar named '%s'", varName);
return 0;
}
if (var->m_flags & 0x4 || var->m_flags & 0x100) {
luaL_error(L, "\"%s\" is read-only", varName);
return 0;
}
if (!(var->m_flags & 0x8)/* TODO || CSimpleTop::GetInstance()->dword124C */) {
auto value = lua_tostring(L, 2);
if (!value) {
value = "0";
}
var->Set(value, true, false, false, true);
if (lua_isstring(L, 3)) {
auto scriptVarName = lua_tostring(L, 3);
FrameScript_SignalEvent(SCRIPT_CVAR_UPDATE, "%s%s", scriptVarName, value);
}
} else {
// TODO CGGameUI::ShowBlockedActionFeedback(nullptr, 2);
}
return 0;
} }
int32_t Script_GetCVar(lua_State* L) { int32_t Script_GetCVar(lua_State* L) {

View File

@ -1187,7 +1187,7 @@ void ScriptEventsInitialize() {
g_scriptEvents[295] = "TRAINER_UPDATE"; g_scriptEvents[295] = "TRAINER_UPDATE";
g_scriptEvents[296] = "TRAINER_DESCRIPTION_UPDATE"; g_scriptEvents[296] = "TRAINER_DESCRIPTION_UPDATE";
g_scriptEvents[297] = "TRAINER_CLOSED"; g_scriptEvents[297] = "TRAINER_CLOSED";
g_scriptEvents[298] = "CVAR_UPDATE"; g_scriptEvents[SCRIPT_CVAR_UPDATE] = "CVAR_UPDATE";
g_scriptEvents[299] = "TRADE_SKILL_SHOW"; g_scriptEvents[299] = "TRADE_SKILL_SHOW";
g_scriptEvents[300] = "TRADE_SKILL_UPDATE"; g_scriptEvents[300] = "TRADE_SKILL_UPDATE";
g_scriptEvents[301] = "TRADE_SKILL_CLOSE"; g_scriptEvents[301] = "TRADE_SKILL_CLOSE";

View File

@ -9,6 +9,8 @@ enum SCRIPTEVENT {
SCRIPT_PLAYER_LOGOUT = 254, SCRIPT_PLAYER_LOGOUT = 254,
SCRIPT_PLAYER_ENTERING_WORLD = 255, SCRIPT_PLAYER_ENTERING_WORLD = 255,
// TODO // TODO
SCRIPT_CVAR_UPDATE = 298,
// TODO
}; };
#endif #endif