From a4b10c75e1473eb9d2b5876cab92716509a2a18e Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Sat, 15 Feb 2020 10:24:05 +0200
Subject: [PATCH] [Client] Remove unneccessary addConsoleCommandObject() from
 ObjectList

---
 apps/openmw/mwgui/console.cpp   | 2 +-
 apps/openmw/mwmp/ObjectList.cpp | 9 ---------
 apps/openmw/mwmp/ObjectList.hpp | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 30714e97f..b693f3ac0 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -227,7 +227,7 @@ namespace MWGui
                     objectList->cell = mwmp::Main::get().getLocalPlayer()->cell;
                 else
                 {
-                    objectList->addConsoleCommandObject(mPtr);
+                    objectList->addObjectGeneric(mPtr);
                 }
 
                 objectList->sendConsoleCommand();
diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp
index 061cdce88..9b1f2235d 100644
--- a/apps/openmw/mwmp/ObjectList.cpp
+++ b/apps/openmw/mwmp/ObjectList.cpp
@@ -1166,15 +1166,6 @@ void ObjectList::addVideoPlay(std::string filename, bool allowSkipping)
     addBaseObject(baseObject);
 }
 
-void ObjectList::addConsoleCommandObject(const MWWorld::Ptr& ptr)
-{
-    cell = *ptr.getCell()->getCell();
-
-    mwmp::BaseObject baseObject = getBaseObjectFromPtr(ptr);
-
-    addBaseObject(baseObject);
-}
-
 void ObjectList::addClientScriptLocal(const MWWorld::Ptr& ptr, int index, int value)
 {
     cell = *ptr.getCell()->getCell();
diff --git a/apps/openmw/mwmp/ObjectList.hpp b/apps/openmw/mwmp/ObjectList.hpp
index 47f349e62..8d6e5e4b8 100644
--- a/apps/openmw/mwmp/ObjectList.hpp
+++ b/apps/openmw/mwmp/ObjectList.hpp
@@ -66,7 +66,6 @@ namespace mwmp
         void addDoorState(const MWWorld::Ptr& ptr, MWWorld::DoorState state);
         void addMusicPlay(std::string filename);
         void addVideoPlay(std::string filename, bool allowSkipping);
-        void addConsoleCommandObject(const MWWorld::Ptr& ptr);
         void addClientScriptLocal(const MWWorld::Ptr& ptr, int index, int value);
         void addClientScriptLocal(const MWWorld::Ptr& ptr, int index, float value);
         void addScriptMemberShort(std::string refId, int index, int shortVal);