OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Fix plNetClient.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-29 01:46:26 -08:00
parent 745378f9be
commit e7319c8ab2
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
View File

@ -461,7 +461,8 @@ void plNetClientMgr::StartLinkInFX()
plLinkEffectsTriggerMsg* lem = new plLinkEffectsTriggerMsg(); plLinkEffectsTriggerMsg* lem = new plLinkEffectsTriggerMsg();
lem->SetLeavingAge(false); // linking in lem->SetLeavingAge(false); // linking in
lem->SetLinkKey(fLocalPlayerKey); lem->SetLinkKey(fLocalPlayerKey);
lem->SetLinkInAnimKey(avMod->GetLinkInAnimKey()); plKey animKey = avMod->GetLinkInAnimKey();
lem->SetLinkInAnimKey(animKey);
// indicate if we are invisible // indicate if we are invisible
if (avMod && avMod->IsInStealthMode() && avMod->GetTarget(0)) if (avMod && avMod->IsInStealthMode() && avMod->GetTarget(0))
@ -1287,7 +1288,7 @@ void plNetClientMgr::QueueDisableNet (bool showDlg, const char str[]) {
msg->Ref(); msg->Ref();
fDisableMsg = msg; fDisableMsg = msg;
IDisableNet(); IDisableNet();
#endif; #endif
} }
void plNetClientMgr::IDisableNet () { void plNetClientMgr::IDisableNet () {

3
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp
View File

@ -163,7 +163,8 @@ void plNetClientMgr::ISendCCRPetition(plCCRPetitionMsg* petMsg)
// write config info formatted like an ini file to a buffer // write config info formatted like an ini file to a buffer
hsRAMStream ram; hsRAMStream ram;
info.WriteTo( &plIniStreamConfigSource( &ram ) ); plIniStreamConfigSource src(&ram);
info.WriteTo(&src);
int size = ram.GetPosition(); int size = ram.GetPosition();
ram.Rewind(); ram.Rewind();
std::string buf; std::string buf;

1
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrVoice.cpp
View File

@ -41,6 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/ *==LICENSE==*/
#include <algorithm> #include <algorithm>
#include <float.h>
#include "hsMatrix44.h" #include "hsMatrix44.h"
#include "hsGeometry3.h" #include "hsGeometry3.h"
#include "plNetClientMgr.h" #include "plNetClientMgr.h"

4
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp
View File

@ -402,8 +402,8 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgVoice)
int bufLen = m->GetVoiceDataLen(); int bufLen = m->GetVoiceDataLen();
const char* buf = m->GetVoiceData(); const char* buf = m->GetVoiceData();
BYTE flags = m->GetFlags(); uint8_t flags = m->GetFlags();
BYTE numFrames = m->GetNumFrames(); uint8_t numFrames = m->GetNumFrames();
plKey key = NULL; plKey key = NULL;
// plKey key=hsgResMgr::ResMgr()->FindKey(m->ObjectInfo()->GetUoid()); // plKey key=hsgResMgr::ResMgr()->FindKey(m->ObjectInfo()->GetUoid());

16
Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp
View File

@ -912,8 +912,10 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// BASIC LINK. Link to a unique instance of the age, if no instance specified. // BASIC LINK. Link to a unique instance of the age, if no instance specified.
case plNetCommon::LinkingRules::kBasicLink: case plNetCommon::LinkingRules::kBasicLink:
if (!info->HasAgeInstanceGuid()) if (!info->HasAgeInstanceGuid()) {
info->SetAgeInstanceGuid(&plUUID(GuidGenerate())); plUUID newuuid(GuidGenerate());
info->SetAgeInstanceGuid(&newuuid);
}
break; break;
//-------------------------------------------------------------------- //--------------------------------------------------------------------
@ -952,7 +954,8 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
info->SetAgeDescription(desc.c_str()); info->SetAgeDescription(desc.c_str());
} }
if (!info->HasAgeInstanceGuid()) { if (!info->HasAgeInstanceGuid()) {
info->SetAgeInstanceGuid(&plUUID(GuidGenerate())); plUUID newuuid(GuidGenerate());
info->SetAgeInstanceGuid(&newuuid);
} }
// register this as an owned age now before we link to it. // register this as an owned age now before we link to it.
@ -992,7 +995,8 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
} }
if (!info->HasAgeInstanceGuid()) { if (!info->HasAgeInstanceGuid()) {
info->SetAgeInstanceGuid(&plUUID(GuidGenerate())); plUUID newuuid(GuidGenerate());
info->SetAgeInstanceGuid(&newuuid);
} }
VaultRegisterOwnedAge(link); VaultRegisterOwnedAge(link);
@ -1078,10 +1082,10 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void)
case hsFail: case hsFail:
success = kLinkFailed; success = kLinkFailed;
break; break;
case FALSE: case false:
success = kLinkDeferred; success = kLinkDeferred;
break; break;
case TRUE: case true:
success = kLinkImmediately; success = kLinkImmediately;
} }

3
Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.cpp
View File

@ -171,7 +171,8 @@ void plAgeInfoStruct::CopyFrom(const NetAgeInfo & info) {
StrToAnsi(tmp, info.ageDesc, arrsize(tmp)); StrToAnsi(tmp, info.ageDesc, arrsize(tmp));
SetAgeDescription(tmp); SetAgeDescription(tmp);
SetAgeInstanceGuid(&plUUID(info.ageInstId)); plUUID inst(info.ageInstId);
SetAgeInstanceGuid(&inst);
SetAgeSequenceNumber(info.ageSequenceNumber); SetAgeSequenceNumber(info.ageSequenceNumber);
SetAgeLanguage(info.ageLanguage); SetAgeLanguage(info.ageLanguage);
} }