Merge 4a102c6ace into 4857e817c5

src/glue/CGlueMgr.cpp

@@ -47,6 +47,7 @@ float CGlueMgr::m_aspect;
 bool CGlueMgr::m_authenticated;
 const CharacterSelectionDisplay* CGlueMgr::m_characterInfo;
 int32_t CGlueMgr::m_clientKickReason;
+int32_t CGlueMgr::m_contestAccepted = 1; // TODO
 char CGlueMgr::m_currentScreen[64];
 EffectDeath* CGlueMgr::m_deathEffect;
 int32_t CGlueMgr::m_disconnectPending;

src/glue/CGlueMgr.hpp

@@ -41,6 +41,7 @@ class CGlueMgr {
         static bool m_authenticated;
         static const CharacterSelectionDisplay* m_characterInfo;
         static int32_t m_clientKickReason;
+        static int32_t m_contestAccepted;
         static char m_currentScreen[];
         static EffectDeath* m_deathEffect;
         static int32_t m_disconnectPending;

src/glue/GlueScript.cpp

@@ -222,7 +222,14 @@ int32_t Script_ShowContestNotice(lua_State* L) {
 }
 
 int32_t Script_ContestAccepted(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    if (CGlueMgr::m_contestAccepted) {
+        lua_pushnumber(L, 1.0);
+    }
+    else {
+        lua_pushnil(L);
+    }
+
+    return 1;
 }
 
 int32_t Script_AcceptContest(lua_State* L) {

src/ui/simple/CSimpleFrameScript.cpp

@@ -2,10 +2,13 @@
 #include "gx/Coordinate.hpp"
 #include "ui/CBackdropGenerator.hpp"
 #include "ui/FrameScript.hpp"
+#include "ui/FrameXML.hpp"
 #include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
+#include <storm/Memory.hpp>
 #include <algorithm>
 #include <cstdint>
 #include <limits>
@@ -19,7 +22,66 @@ int32_t CSimpleFrame_CreateTitleRegion(lua_State* L) {
 }
 
 int32_t CSimpleFrame_CreateTexture(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    auto type = CSimpleFrame::GetObjectType();
+    auto frame = static_cast<CSimpleFrame*>(FrameScript_GetObjectThis(L, type));
+
+    const char* name = nullptr;
+    if (lua_isstring(L, 2)) {
+        name = lua_tostring(L, 2);
+    }
+
+    int32_t drawlayer = DRAWLAYER_ARTWORK;
+    if (lua_isstring(L, 3)) {
+        auto drawlayerStr = lua_tostring(L, 3);
+        StringToDrawLayer(drawlayerStr, drawlayer);
+    }
+
+    XMLNode* inheritNode = nullptr;
+
+    if (lua_type(L, 4) == LUA_TSTRING) {
+        auto inheritName = lua_tostring(L, 4);
+        const char* tainted;
+        bool locked;
+
+        inheritNode = FrameXML_AcquireHashNode(inheritName, tainted, locked);
+
+        if (!inheritNode) {
+            luaL_error(L, "%s:CreateTexture(): Couldn't find inherited node \"%s\"", frame->GetDisplayName(), inheritName);
+            return 0;
+        }
+
+        if (locked) {
+            luaL_error(L, "%s:CreateTexture(): Recursively inherited node \"%s\"", frame->GetDisplayName(), inheritName);
+            return 0;
+        }
+    }
+
+    // TODO CDataAllocator::GetData
+    auto texture = STORM_NEW(CSimpleTexture)(frame, drawlayer, true);
+
+    if (name && *name) {
+        texture->SetName(name);
+    }
+
+    if (inheritNode) {
+        CStatus status;
+
+        texture->LoadXML(inheritNode, &status);
+        texture->PostLoadXML(inheritNode, &status);
+
+        auto inheritName = lua_tostring(L, 4);
+        FrameXML_ReleaseHashNode(inheritName);
+    }
+
+    // TODO anim related logic?
+
+    if (!texture->lua_registered) {
+        texture->RegisterScriptObject(nullptr);
+    }
+
+    lua_rawgeti(L, LUA_REGISTRYINDEX, texture->lua_objectRef);
+
+    return 1;
 }
 
 int32_t CSimpleFrame_CreateFontString(lua_State* L) {