mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 23:06:43 +00:00
Code Issues Releases Wiki Activity

[Client] Remove unneccessary addConsoleCommandObject() from ObjectList

Browse source
This commit is contained in:
David Cernat 2020-02-15 10:24:05 +02:00
parent 643c979d31
commit a4b10c75e1
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/console.cpp
View file

@ -227,7 +227,7 @@ namespace MWGui
objectList->cell = mwmp::Main::get().getLocalPlayer()->cell; objectList->cell = mwmp::Main::get().getLocalPlayer()->cell;
else else
{ {
objectList->addConsoleCommandObject(mPtr); objectList->addObjectGeneric(mPtr);
} }
objectList->sendConsoleCommand(); objectList->sendConsoleCommand();

9
apps/openmw/mwmp/ObjectList.cpp
View file

@ -1166,15 +1166,6 @@ void ObjectList::addVideoPlay(std::string filename, bool allowSkipping)
addBaseObject(baseObject); 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) void ObjectList::addClientScriptLocal(const MWWorld::Ptr& ptr, int index, int value)
{ {
cell = *ptr.getCell()->getCell(); cell = *ptr.getCell()->getCell();

1
apps/openmw/mwmp/ObjectList.hpp
View file

@ -66,7 +66,6 @@ namespace mwmp
void addDoorState(const MWWorld::Ptr& ptr, MWWorld::DoorState state); void addDoorState(const MWWorld::Ptr& ptr, MWWorld::DoorState state);
void addMusicPlay(std::string filename); void addMusicPlay(std::string filename);
void addVideoPlay(std::string filename, bool allowSkipping); 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, int value);
void addClientScriptLocal(const MWWorld::Ptr& ptr, int index, float value); void addClientScriptLocal(const MWWorld::Ptr& ptr, int index, float value);
void addScriptMemberShort(std::string refId, int index, int shortVal); void addScriptMemberShort(std::string refId, int index, int shortVal);