OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

fix for g++:

Browse Source 
fix plVault LogMsg calls + remove useless wide char usage
	fix usage of plAvatarMgr::FindAvatar() and plLinkEffectsTriggerMsg::SetLinkKey() with temporary variables
	plNetServerSessionInfo.h need std::string
	fix plProgressMgr.h: NumLoadingFrames() have an useless class context information
	fix plSocket usage of non-standard NULL
This commit is contained in:
Vincent Munsch
2014-04-16 18:13:40 +02:00
parent 683945fb7d
commit a1edba6267
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp
View File

@ -717,7 +717,7 @@ plArmatureMod *plAvatarMgr::GetFirstRemoteAvatar()
return nil;
}
plArmatureMod* plAvatarMgr::FindAvatar(plKey& avatarKey)
plArmatureMod* plAvatarMgr::FindAvatar(const plKey& avatarKey)
{
plSceneObject *so = plSceneObject::ConvertNoRef(avatarKey->ObjectIsLoaded());
if (so)

2
Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.h
View File

@ -141,7 +141,7 @@ public:
plArmatureMod *GetLocalAvatar();
plKey GetLocalAvatarKey();
static plArmatureMod *FindAvatar(plKey& avatarKey); // Key of the sceneObject
static plArmatureMod *FindAvatar(const plKey& avatarKey); // Key of the sceneObject
plArmatureMod *FindAvatarByPlayerID(uint32_t pid);
plArmatureMod *FindAvatarByModelName(const plString& name); // Probably only useful for custom NPCs. All players are
// either "Male" or "Female".

4
Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp
View File

@ -272,7 +272,7 @@ void plLinkEffectsTriggerMsg::WriteVersion(hsStream* s, hsResMgr* mgr)
mgr->WriteKey(s, fLinkInAnimKey);
}
void plLinkEffectsTriggerMsg::SetLinkKey(plKey &key)
void plLinkEffectsTriggerMsg::SetLinkKey(const plKey &key)
{
fLinkKey = key;
}
@ -429,4 +429,4 @@ void plPseudoLinkAnimCallbackMsg::Write(hsStream* stream, hsResMgr* mgr)
{
plMessage::IMsgWrite(stream,mgr);
mgr->WriteKey(stream, fAvatarKey);
}
}

2
Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.h
View File

@ -150,7 +150,7 @@ public:
void SetLeavingAge(bool leaving) { fLeavingAge = leaving; }
bool IsLeavingAge() { return fLeavingAge; }
void SetLinkKey(plKey &key);
void SetLinkKey(const plKey &key);
const plKey GetLinkKey() const { return fLinkKey; }
void SetLinkInAnimKey(plKey &key);

1
Sources/Plasma/PubUtilLib/plNetCommon/plNetServerSessionInfo.h
View File

@ -42,6 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef plNetServerSessionInfo_h_inc
#define plNetServerSessionInfo_h_inc
#include <string>
#include "HeadSpin.h"
#include "pnFactory/plCreatable.h"

2
Sources/Plasma/PubUtilLib/plProgressMgr/plProgressMgr.h
View File

@ -236,7 +236,7 @@ class plProgressMgr
static plProgressMgr* GetInstance() { return fManager; }
static const plString GetLoadingFrameID(int index);
uint32_t plProgressMgr::NumLoadingFrames() const;
uint32_t NumLoadingFrames() const;
static const plString GetStaticTextID(StaticText staticTextType);
virtual void Draw( plPipeline *p ) { }

4
Sources/Plasma/PubUtilLib/plSockets/plSocket.cpp
View File

@ -151,7 +151,7 @@ bool plSocket::IsBlocking()
#ifdef BSDBLOCK
#error "BSDBLOCK: TODO: IsBlocking() for bsd."
#else
int ans = plNet::Ioctl(fSocket,FIONBIO,NULL);
int ans = plNet::Ioctl(fSocket,FIONBIO,nullptr);
return (ans!=0);
#endif
}
@ -208,4 +208,4 @@ int plSocket::IGetTimeOutsFromSocket()
fSendTimeOut = stimeoutval;
}
return 0;
}
}

8
Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp
View File

@ -2790,7 +2790,7 @@ bool VaultRegisterOwnedAgeAndWait (const plAgeLinkStruct * link) {
}
if (IS_NET_ERROR(param.result)) {
LogMsg(kLogError, L"RegisterOwnedAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
LogMsg(kLogError, "RegisterOwnedAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
break;
}
@ -3164,7 +3164,7 @@ bool VaultRegisterVisitAgeAndWait (const plAgeLinkStruct * link) {
}
if (IS_NET_ERROR(param.result)) {
LogMsg(kLogError, L"RegisterVisitAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
LogMsg(kLogError, "RegisterVisitAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
break;
}
@ -4436,7 +4436,7 @@ bool VaultAgeFindOrCreateSubAgeLinkAndWait (
}
if (IS_NET_ERROR(param.result)) {
LogMsg(kLogError, L"CreateSubAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
LogMsg(kLogError, "CreateSubAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
return false;
}
@ -4794,7 +4794,7 @@ bool VaultAgeFindOrCreateChildAgeLinkAndWait (
}
if (IS_NET_ERROR(param.result)) {
LogMsg(kLogError, L"CreateChildAge: Failed to init age %S", link->GetAgeInfo()->GetAgeFilename());
LogMsg(kLogError, "CreateChildAge: Failed to init age %s", link->GetAgeInfo()->GetAgeFilename().c_str());
return false;
}