From 494edbe5cb998403e31000cdbd62da41e2bda398 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 5 Jun 2018 14:16:27 +0300 Subject: [PATCH] [General] Add REPLY_TO_REQUEST container sub-action --- apps/openmw/mwmp/processors/object/ProcessorContainer.hpp | 1 + components/openmw-mp/Base/BaseObject.hpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp b/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp index f5aee6947..df01e13ea 100644 --- a/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp +++ b/apps/openmw/mwmp/processors/object/ProcessorContainer.hpp @@ -29,6 +29,7 @@ namespace mwmp objectList.reset(); objectList.cell = *ptrCellStore->getCell(); objectList.action = mwmp::BaseObjectList::SET; + objectList.containerSubAction = mwmp::BaseObjectList::REPLY_TO_REQUEST; objectList.addAllContainers(ptrCellStore); objectList.sendContainer(); } diff --git a/components/openmw-mp/Base/BaseObject.hpp b/components/openmw-mp/Base/BaseObject.hpp index 295a80c90..02f40097b 100644 --- a/components/openmw-mp/Base/BaseObject.hpp +++ b/components/openmw-mp/Base/BaseObject.hpp @@ -94,7 +94,8 @@ namespace mwmp NONE = 0, DRAG = 1, DROP = 2, - TAKE_ALL = 3 + TAKE_ALL = 3, + REPLY_TO_REQUEST = 4 }; RakNet::RakNetGUID guid; @@ -106,7 +107,7 @@ namespace mwmp std::string consoleCommand; unsigned char action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item, 3 - Request items - unsigned char containerSubAction; // 0 - None, 1 - Drag, 2 - Take all + unsigned char containerSubAction; // 0 - None, 1 - Drag, 2 - Drop, 3 - Take all, 4 - Reply to request bool isValid; };