Merge b902b5484e into 7ec9a35b4b

src/glue/CGlueMgr.cpp

@@ -39,6 +39,7 @@
 #include <cstdio>
 
 int32_t CGlueMgr::m_acceptedEULA = 1; // TODO
+int32_t CGlueMgr::m_acceptedScanning = 1; // TODO
 int32_t CGlueMgr::m_acceptedTerminationWithoutNotice;
 int32_t CGlueMgr::m_acceptedTOS = 1; // TODO
 int32_t CGlueMgr::m_accountMsgAvailable;

src/glue/CGlueMgr.hpp

@@ -33,6 +33,7 @@ class CGlueMgr {
 
         // Static variables
         static int32_t m_acceptedEULA;
+        static int32_t m_acceptedScanning;
         static int32_t m_acceptedTerminationWithoutNotice;
         static int32_t m_acceptedTOS;
         static int32_t m_accountMsgAvailable;

src/glue/GlueScript.cpp

@@ -216,7 +216,14 @@ int32_t Script_ShowScanningNotice(lua_State* L) {
 }
 
 int32_t Script_ScanningAccepted(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    if (CGlueMgr::m_acceptedScanning) {
+        lua_pushnumber(L, 1.0);
+    }
+    else {
+        lua_pushnil(L);
+    }
+
+    return 1;
 }
 
 int32_t Script_AcceptScanning(lua_State* L) {

src/ui/game/ActionBarScript.cpp

@@ -83,7 +83,9 @@ int32_t Script_IsActionInRange(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) {

src/ui/game/CGActionBar.cpp

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

src/ui/game/CGActionBar.hpp

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

src/ui/game/GameScript.cpp

@@ -4,6 +4,7 @@
 #include "ui/FrameScript.hpp"
 #include "ui/ScriptFunctionsShared.hpp"
 #include "ui/game/CGGameUI.hpp"
+#include "ui/game/Types.hpp"
 #include "ui/simple/CSimpleTop.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
@@ -131,7 +132,41 @@ int32_t Script_GetCVarInfo(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) {

src/ui/game/ScriptEvents.cpp

@@ -1187,7 +1187,7 @@ void ScriptEventsInitialize() {
     g_scriptEvents[295] = "TRAINER_UPDATE";
     g_scriptEvents[296] = "TRAINER_DESCRIPTION_UPDATE";
     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[300] = "TRADE_SKILL_UPDATE";
     g_scriptEvents[301] = "TRADE_SKILL_CLOSE";

src/ui/game/Types.hpp

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