Merge 4a102c6ace into f1b8f495b6

src/glue/CGlueMgr.cpp

@@ -46,6 +46,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/CSimpleFrame.cpp

@@ -64,11 +64,27 @@ CSimpleFrame::CSimpleFrame(CSimpleFrame* parent) : CScriptRegion() {
 }
 
 CSimpleFrame::~CSimpleFrame() {
-    // TODO
-
     this->m_intAC = 3;
 
     this->m_top->UnregisterFrame(this);
+    this->m_top = nullptr;
+
+    if (this->m_titleRegion) {
+        delete this->m_titleRegion;
+    }
+
+    for (int32_t layer = 0; layer < NUM_SIMPLEFRAME_DRAWLAYERS; layer++) {
+        this->m_drawlayers[layer].UnlinkAll();
+
+        if (this->m_batch[layer]) {
+            delete this->m_batch[layer];
+        }
+    }
+
+    while (auto region = this->m_regions.Head()) {
+        this->m_regions.UnlinkNode(region);
+        delete region;
+    }
 
     // TODO
 }

src/ui/simple/CSimpleTop.cpp

@@ -400,6 +400,18 @@ CSimpleTop::CSimpleTop() : CLayoutFrame() {
 CSimpleTop::~CSimpleTop() {
     // TODO
 
+    while (auto frame = this->m_frames.Head()) {
+        this->m_frames.UnlinkNode(frame);
+        delete frame;
+    }
+
+    for (auto& strata : this->m_strata) {
+        delete strata;
+        strata = nullptr;
+    }
+
+    // TODO
+
     this->DisableEvents();
 
     HandleClose(this->m_screenLayer);