JAWWindow (#3039)

3 files changed, 12 insertions, 80 deletions

diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp
index 18d7e87626..ccaa67aaa4 100644
--- a/src/JSystem/J2DGraph/J2DPane.cpp
+++ b/src/JSystem/J2DGraph/J2DPane.cpp
@@ -337,7 +337,7 @@ void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* p_grafCtx, bool isOrthoGr
         }
 
         for (JSUTreeIterator<J2DPane> iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) {
-            iter.getObject()->draw(0, 0, p_grafCtx, isOrthoGraf, param_4);
+            iter->draw(0, 0, p_grafCtx, isOrthoGraf, param_4);
         }
     }
 }
@@ -859,42 +859,9 @@ void J2DPane::updateTransform(J2DAnmTransform const* p_anmTransform) {
     }
 }
 
-void J2DPane::drawSelf(f32, f32, f32 (*)[3][4]) {
-    /* empty function */
-}
-
-void J2DPane::rewriteAlpha() {
-    /* empty function */
-}
-
-void J2DPane::setAnimationVF(J2DAnmVisibilityFull* p_visibility) {
-    setAnimation(p_visibility);
-}
-
-void J2DPane::setAnimationVC(J2DAnmVtxColor* p_vtxColor) {
-    setAnimation(p_vtxColor);
-}
-
-void J2DPane::setCullBack(bool cull) {
-    GXCullMode mode;
-
-    if (!cull)
-        mode = GX_CULL_NONE;
-    else
-        mode = GX_CULL_BACK;
-
-    setCullBack(mode);
-}
-
-bool J2DPane::setConnectParent(bool connected) {
-    mConnected = false;
-    return false;
-}
-
-void J2DPane::update() {
-    /* empty function */
-}
-
-void J2DPane::drawSelf(f32, f32) {
-    /* empty function */
+static void dummy(J2DPane* pane) {
+    pane->drawSelf(0.0f, 0.0f);
+    pane->update();
+    pane->setConnectParent(false);
+    pane->setCullBack(false);
 }
diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp
index 78c89ff2b8..7907afc8c9 100644
--- a/src/JSystem/J2DGraph/J2DWindow.cpp
+++ b/src/JSystem/J2DGraph/J2DWindow.cpp
@@ -628,42 +628,3 @@ bool J2DWindow::isUsed(ResTIMG const* param_0) {
     }
     return J2DPane::isUsed(param_0);
 }
-
-u16 J2DWindow::getTypeID() const {
-    return 17;
-}
-
-void J2DWindow::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
-    draw(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3));
-}
-
-JUTTexture* J2DWindow::getContentsTexture(u8 param_0) const {
-    if (param_0 != 0) {
-        return NULL;
-    }
-    return field_0x110;
-}
-
-void J2DWindow::getMaterial(J2DWindow::TMaterial& param_0) const {
-    param_0.field_0x0 = NULL;
-    param_0.field_0x4 = NULL;
-    param_0.field_0x8 = NULL;
-    param_0.field_0xc = NULL;
-    param_0.field_0x10 = NULL;
-}
-
-J2DMaterial* J2DWindow::getFrameMaterial(u8 param_0) const {
-    return NULL;
-}
-
-J2DMaterial* J2DWindow::getContentsMaterial() const {
-    return NULL;
-}
-
-bool J2DWindow::isUsed(ResFONT const* param_0) {
-    return J2DPane::isUsed(param_0);
-}
-
-void J2DWindow::rewriteAlpha() {
-    /* empty function */
-}
diff --git a/src/JSystem/JAWExtSystem/JAWWindow.cpp b/src/JSystem/JAWExtSystem/JAWWindow.cpp
index 7153fd0d2d..5163355615 100644
--- a/src/JSystem/JAWExtSystem/JAWWindow.cpp
+++ b/src/JSystem/JAWExtSystem/JAWWindow.cpp
@@ -22,8 +22,6 @@ JAWWindow::JAWWindow(const char* param_1, int param_2, int param_3) :
     field_0x38.appendChild(&field_0x2b0);
 }
 
-JAWWindow::TJ2DWindowDraw::TJ2DWindowDraw(u32 param_1, const JGeometry::TBox2<f32>& param_2, const char* param_3) : J2DWindow(param_1, param_2, param_3, TEXTUREBASE_0, NULL) {}
-
 JAWWindow::~JAWWindow() {}
 
 BOOL JAWWindow::initIf() {
@@ -194,6 +192,8 @@ JAWWindow::TWindowText::TWindowText(JAWWindow* window) :
     field_0x11c(0, 0) {
 }
 
+JAWWindow::TWindowText::~TWindowText() {}
+
 void JAWWindow::TWindowText::drawSelf(f32 param_1, f32 param_2) {
     Mtx mtx;
     MTXIdentity(mtx);
@@ -211,3 +211,7 @@ void JAWWindow::TWindowText::drawSelf(f32, f32, Mtx* param_3) {
     m_pParent->setMatrix(stack_48);
     m_pParent->onDraw(&field_0xfc);
 }
+
+static void dummy(J2DPane* pane, J2DWindow* window) {
+    pane->rewriteAlpha();
+}