Quitado código del LSL bridge y funciones dependientes
Corrección de errores previos en la migración. Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
@@ -72,7 +72,6 @@
|
||||
// <FS:Ansariel> [FS communication UI]
|
||||
#include "fsfloatervoicecontrols.h"
|
||||
// </FS:Ansariel> [FS communication UI]
|
||||
#include "fslslbridge.h"
|
||||
#include "fsradar.h"
|
||||
|
||||
// Boost includes
|
||||
@@ -3635,8 +3634,7 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep
|
||||
if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) )
|
||||
{
|
||||
// Ansa: Do not include the bridge when checking for number of objects
|
||||
S32 bridge_correct = (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0;
|
||||
bool fWorn = ((pAttachPt->getNumObjects() - bridge_correct) > 0) &&
|
||||
bool fWorn = (pAttachPt->getNumObjects() > 0) &&
|
||||
( (!RlvSettings::getHideLockedAttach()) || (RlvForceWear::isForceDetachable(pAttachPt, true, rlvCmd.getObjectID())) );
|
||||
strReply.push_back( (fWorn) ? '1' : '0' );
|
||||
}
|
||||
@@ -3665,10 +3663,8 @@ ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& s
|
||||
switch (rlvCmd.getBehaviourType())
|
||||
{
|
||||
case RLV_BHVR_GETATTACHNAMES: // Every attachment point that has an attached object
|
||||
// Ansa: Do not include the bridge when checking for number of objects
|
||||
{
|
||||
S32 bridge_correct = ((pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0);
|
||||
fAdd = ((pAttachPt->getNumObjects() - bridge_correct) > 0);
|
||||
fAdd = (pAttachPt->getNumObjects() > 0);
|
||||
}
|
||||
break;
|
||||
case RLV_BHVR_GETADDATTACHNAMES: // Every attachment point that can be attached to (wear replace OR wear add)
|
||||
|
||||
Reference in New Issue
Block a user