From 6c767b2061d11b10c62c7f12194c73273aaecd19 Mon Sep 17 00:00:00 2001
From: floralrainfall <waternewgatchi@gmail.com>
Date: Sat, 22 Jul 2023 04:23:52 -0400
Subject: [PATCH] remove test baseplate on load

---
 Projects/Engine/Source/App/Humanoid/Humanoid.cpp | 10 ----------
 Projects/Engine/Source/App/V8/World/World.cpp    |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Projects/Engine/Source/App/Humanoid/Humanoid.cpp b/Projects/Engine/Source/App/Humanoid/Humanoid.cpp
index 468dd6c..8a1aeb4 100644
--- a/Projects/Engine/Source/App/Humanoid/Humanoid.cpp
+++ b/Projects/Engine/Source/App/Humanoid/Humanoid.cpp
@@ -37,14 +37,6 @@ namespace RNR
 
     void Humanoid::buildJoints()
     {
-        if(getTorso() && getHead())
-        {
-            Weld* headWeld = new Weld();
-            headWeld->setBodies(getTorso(), getHead());
-            headWeld->link();
-            headWeld->setParent(getTorso());
-        }
-
         if(getTorso())
         {
             btTransform ghostTransform;
@@ -148,8 +140,6 @@ namespace RNR
             move = direction * move;
             move *= world->getComPlicitNgine()->getLastPhysicsDelta();
 
-            m_characterController->playerStep(world->getDynamicsWorld(), forward);
-
             bool move_valid = true;
 
             // TODO: collision checking
diff --git a/Projects/Engine/Source/App/V8/World/World.cpp b/Projects/Engine/Source/App/V8/World/World.cpp
index 0ac5954..575011a 100644
--- a/Projects/Engine/Source/App/V8/World/World.cpp
+++ b/Projects/Engine/Source/App/V8/World/World.cpp
@@ -109,6 +109,13 @@ namespace RNR
     {
         m_refs.clear();
 
+        Instance* baseplate = findFirstChild("Baseplate");
+        if(baseplate)
+        {
+            baseplate->setParent(NULL);
+            delete baseplate;
+        }
+
         JointsService* joints = (JointsService*)m_datamodel->getService("JointsService");
         Camera* old_camera = m_workspace->getCurrentCamera();
         if(old_camera)