@ -1319,7 +1319,8 @@ void cyMisc::SetPrivateChatList(const std::vector<pyPlayer*> & tolist)
for ( int i = 0 ; i < tolist . size ( ) ; i + + ) for ( int i = 0 ; i < tolist . size ( ) ; i + + )
pMsg - > GetClientList ( ) - > Append ( tolist [ i ] - > GetPlayerID ( ) ) ; pMsg - > GetClientList ( ) - > Append ( tolist [ i ] - > GetPlayerID ( ) ) ;
pMsg - > SetRemovedKey ( plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ) ; plKey k = plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ;
pMsg - > SetRemovedKey ( k ) ;
pMsg - > Send ( ) ; pMsg - > Send ( ) ;
} }
} }
@ -1336,7 +1337,8 @@ void cyMisc::SetPrivateChatList(const std::vector<pyPlayer*> & tolist)
void cyMisc : : ClearPrivateChatList ( pyKey & member ) void cyMisc : : ClearPrivateChatList ( pyKey & member )
{ {
plNetVoiceListMsg * pMsg = new plNetVoiceListMsg ( plNetVoiceListMsg : : kDistanceMode ) ; plNetVoiceListMsg * pMsg = new plNetVoiceListMsg ( plNetVoiceListMsg : : kDistanceMode ) ;
pMsg - > SetRemovedKey ( member . getKey ( ) ) ; plKey k = member . getKey ( ) ;
pMsg - > SetRemovedKey ( k ) ;
pMsg - > Send ( ) ; pMsg - > Send ( ) ;
} }
@ -1550,7 +1552,7 @@ void cyMisc::EnableAvatarCursorFade()
plIfaceFadeAvatarMsg * iMsg = new plIfaceFadeAvatarMsg ; plIfaceFadeAvatarMsg * iMsg = new plIfaceFadeAvatarMsg ;
iMsg - > SetSubjectKey ( nmgr - > GetLocalPlayerKey ( ) ) ; iMsg - > SetSubjectKey ( nmgr - > GetLocalPlayerKey ( ) ) ;
iMsg - > SetBCastFlag ( plMessage : : kBCastByExactType ) ; iMsg - > SetBCastFlag ( plMessage : : kBCastByExactType ) ;
iMsg - > SetBCastFlag ( plMessage : : kNetPropagate , FALSE ) ; iMsg - > SetBCastFlag ( plMessage : : kNetPropagate , false ) ;
iMsg - > Enable ( ) ; iMsg - > Enable ( ) ;
iMsg - > Send ( ) ; iMsg - > Send ( ) ;
} }
@ -1564,7 +1566,7 @@ void cyMisc::DisableAvatarCursorFade()
plIfaceFadeAvatarMsg * iMsg = new plIfaceFadeAvatarMsg ; plIfaceFadeAvatarMsg * iMsg = new plIfaceFadeAvatarMsg ;
iMsg - > SetSubjectKey ( nmgr - > GetLocalPlayerKey ( ) ) ; iMsg - > SetSubjectKey ( nmgr - > GetLocalPlayerKey ( ) ) ;
iMsg - > SetBCastFlag ( plMessage : : kBCastByExactType ) ; iMsg - > SetBCastFlag ( plMessage : : kBCastByExactType ) ;
iMsg - > SetBCastFlag ( plMessage : : kNetPropagate , FALSE ) ; iMsg - > SetBCastFlag ( plMessage : : kNetPropagate , false ) ;
iMsg - > Disable ( ) ; iMsg - > Disable ( ) ;
iMsg - > Send ( ) ; iMsg - > Send ( ) ;
} }
@ -1579,7 +1581,7 @@ void cyMisc::FadeLocalPlayer(hsBool fade)
pMsg - > SetFadeOut ( fade ) ; pMsg - > SetFadeOut ( fade ) ;
pMsg - > SetSubjectKey ( nmgr - > GetLocalPlayerKey ( ) ) ; pMsg - > SetSubjectKey ( nmgr - > GetLocalPlayerKey ( ) ) ;
pMsg - > SetBCastFlag ( plMessage : : kBCastByExactType ) ; pMsg - > SetBCastFlag ( plMessage : : kBCastByExactType ) ;
pMsg - > SetBCastFlag ( plMessage : : kNetPropagate , FALSE ) ; pMsg - > SetBCastFlag ( plMessage : : kNetPropagate , false ) ;
pMsg - > AddReceiver ( nmgr - > GetLocalPlayerKey ( ) ) ; pMsg - > AddReceiver ( nmgr - > GetLocalPlayerKey ( ) ) ;
plgDispatch : : MsgSend ( pMsg ) ; plgDispatch : : MsgSend ( pMsg ) ;
} }
@ -1661,7 +1663,8 @@ void cyMisc::ToggleAvatarClickability(hsBool on)
pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kGUIEnableAvatarClickable ) ; pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kGUIEnableAvatarClickable ) ;
else else
pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kGUIDisableAvatarClickable ) ; pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kGUIDisableAvatarClickable ) ;
pMsg - > SetAvKey ( plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ) ; plKey k = plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ;
pMsg - > SetAvKey ( k ) ;
pMsg - > SetBCastFlag ( plMessage : : kNetPropagate ) ; pMsg - > SetBCastFlag ( plMessage : : kNetPropagate ) ;
pMsg - > SetBCastFlag ( plMessage : : kNetForce ) ; pMsg - > SetBCastFlag ( plMessage : : kNetForce ) ;
pMsg - > Send ( ) ; pMsg - > Send ( ) ;
@ -1671,7 +1674,8 @@ void cyMisc::ToggleAvatarClickability(hsBool on)
void cyMisc : : SetShareSpawnPoint ( const char * spawnPoint ) void cyMisc : : SetShareSpawnPoint ( const char * spawnPoint )
{ {
plInputIfaceMgrMsg * pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kSetShareSpawnPoint ) ; plInputIfaceMgrMsg * pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kSetShareSpawnPoint ) ;
pMsg - > SetSender ( plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ) ; plKey k = plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ;
pMsg - > SetSender ( k ) ;
pMsg - > SetSpawnPoint ( spawnPoint ) ; pMsg - > SetSpawnPoint ( spawnPoint ) ;
pMsg - > Send ( ) ; pMsg - > Send ( ) ;
} }
@ -1679,7 +1683,8 @@ void cyMisc::SetShareSpawnPoint(const char* spawnPoint)
void cyMisc : : SetShareAgeInstanceGuid ( const Uuid & guid ) void cyMisc : : SetShareAgeInstanceGuid ( const Uuid & guid )
{ {
plInputIfaceMgrMsg * pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kSetShareAgeInstanceGuid ) ; plInputIfaceMgrMsg * pMsg = new plInputIfaceMgrMsg ( plInputIfaceMgrMsg : : kSetShareAgeInstanceGuid ) ;
pMsg - > SetSender ( plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ) ; plKey k = plNetClientMgr : : GetInstance ( ) - > GetLocalPlayerKey ( ) ;
pMsg - > SetSender ( k ) ;
pMsg - > SetAgeInstanceGuid ( guid ) ; pMsg - > SetAgeInstanceGuid ( guid ) ;
pMsg - > Send ( ) ; pMsg - > Send ( ) ;
} }
@ -2427,7 +2432,7 @@ int cyMisc::GetKILevel()
StrToUnicode ( wStr , pfKIMsg : : kChronicleKILevel , arrsize ( wStr ) ) ; StrToUnicode ( wStr , pfKIMsg : : kChronicleKILevel , arrsize ( wStr ) ) ;
if ( RelVaultNode * rvn = VaultFindChronicleEntryIncRef ( wStr ) ) { if ( RelVaultNode * rvn = VaultFindChronicleEntryIncRef ( wStr ) ) {
VaultChronicleNode chron ( rvn ) ; VaultChronicleNode chron ( rvn ) ;
result = _wtoi ( chron . entryValue ) ; result = wcstol ( chron . entryValue , nil , 0 ) ;
rvn - > DecRef ( ) ; rvn - > DecRef ( ) ;
} }
Darryl Pogue
13 years ago